From: Bart Van Assche <bvanassche@acm•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
James Bottomley <James.Bottomley@HansenPartnership•com>,
Jens Axboe <axboe@kernel•dk>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
"Martin K. Petersen" <martin.petersen@oracle•com>,
Martin Wilck <mwilck@suse•com>, Christoph Hellwig <hch@lst•de>
Subject: Re: linux-next: manual merge of the scsi tree with the block tree
Date: Mon, 15 Apr 2019 06:48:21 -0700 [thread overview]
Message-ID: <84c02649-1eeb-3d28-6cc2-0a5d0f5f6b7d@acm.org> (raw)
In-Reply-To: <20190415155939.35325ef1@canb.auug.org.au>
On 4/14/19 10:59 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the scsi tree got a conflict in:
>
> drivers/scsi/sd.c
>
> between commit:
>
> c92e2f04b359 ("block: disk_events: introduce event flags")
>
> from the block tree and commit:
>
> 21e6ba3f0e02 ("scsi: sd: Rely on the driver core for asynchronous probing")
> d16ece577bf2 ("scsi: sd: Inline sd_probe_part2()")
>
> from the scsi 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.
Thanks Stephen for having resolved this conflict. The conflict resolution
looks good to me.
Bart.
next prev parent reply other threads:[~2019-04-15 13:48 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-15 5:59 linux-next: manual merge of the scsi tree with the block tree Stephen Rothwell
2019-04-15 13:48 ` Bart Van Assche [this message]
2019-04-17 19:11 ` Martin Wilck
-- strict thread matches above, loose matches on Subject: below --
2025-01-07 4:09 Stephen Rothwell
2025-01-07 6:03 ` Christoph Hellwig
2023-06-19 3:14 Stephen Rothwell
2022-03-07 4:18 Stephen Rothwell
2022-03-07 4:14 Stephen Rothwell
2021-11-01 5:08 Stephen Rothwell
2021-08-24 6:32 Stephen Rothwell
2021-08-24 6:39 ` Christoph Hellwig
2020-03-25 5:04 Stephen Rothwell
2019-02-18 5:10 Stephen Rothwell
2017-06-21 5:55 Stephen Rothwell
2017-06-19 5:35 Stephen Rothwell
2016-11-08 5:48 Stephen Rothwell
2016-11-08 16:17 ` James Bottomley
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=84c02649-1eeb-3d28-6cc2-0a5d0f5f6b7d@acm.org \
--to=bvanassche@acm$(echo .)org \
--cc=James.Bottomley@HansenPartnership$(echo .)com \
--cc=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=mwilck@suse$(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