From: Jens Axboe <axboe@kernel•dk>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
"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>,
Christoph Hellwig <hch@lst•de>
Subject: Re: linux-next: manual merge of the block tree with the scsi-fixes tree
Date: Thu, 13 Dec 2018 21:06:47 -0700 [thread overview]
Message-ID: <a48f78a5-901b-20be-8df0-d69770710932@kernel.dk> (raw)
In-Reply-To: <20181214132315.601d020f@canb.auug.org.au>
On 12/13/18 7:23 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the block tree got a conflict in:
>
> drivers/scsi/sd.c
>
> between commit:
>
> 61cce6f6eece ("scsi: sd: use mempool for discard special page")
>
> from the scsi-fixes tree and commit:
>
> 159b2cbf59f4 ("scsi: return blk_status_t from scsi_init_io and ->init_command")
>
> from the block tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
Martin, I can carry this one to avoid this conflict. Let me know!
--
Jens Axboe
prev parent reply other threads:[~2018-12-14 4:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-14 2:23 linux-next: manual merge of the block tree with the scsi-fixes tree Stephen Rothwell
2018-12-14 4:06 ` Jens Axboe [this message]
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=a48f78a5-901b-20be-8df0-d69770710932@kernel.dk \
--to=axboe@kernel$(echo .)dk \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=martin.petersen@oracle$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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