From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
"Gustavo A. R. Silva" <gustavo@embeddedor.com>,
Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: manual merge of the scsi-mkp tree with the fixes tree
Date: Thu, 7 Feb 2019 16:51:34 +1100 [thread overview]
Message-ID: <20190207165134.57c853dd@canb.auug.org.au> (raw)
In-Reply-To: <20190207154747.03209c75@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 405 bytes --]
Hi all,
On Thu, 7 Feb 2019 15:47:47 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the scsi-mkp tree got a conflict in:
>
> drivers/scsi/osd/osd_initiator.c
>
> between commit:
>
> 24648908acac ("scsi: osd: osd_initiator: mark expected switch fall-throughs")
I will remove that from my fixes tree for tomorrow.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-02-07 5:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-07 4:47 linux-next: manual merge of the scsi-mkp tree with the fixes tree Stephen Rothwell
2019-02-07 5:51 ` Stephen Rothwell [this message]
2019-02-07 6:15 ` Stephen Rothwell
2019-02-07 13:15 ` Gustavo A. R. Silva
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190207165134.57c853dd@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=gustavo@embeddedor.com \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox