Re: linux-next: manual merge of the scsi tree with the block tree
From: Martin Wilck
Date: Wed Apr 17 2019 - 15:11:17 EST
On Mon, 2019-04-15 at 06:48 -0700, Bart Van Assche wrote:
> 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
> looks good to me.
Yes, it looks good to me as well.