Re: linux-next: manual merge of the scsi tree with the block tree

2019-04-17 Thread Martin Wilck
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 ev

Re: linux-next: manual merge of the scsi tree with the block tree

2019-04-15 Thread Bart Van Assche
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: s

Re: linux-next: manual merge of the scsi tree with the block tree

2016-11-08 Thread James Bottomley
On Tue, 2016-11-08 at 16:48 +1100, Stephen Rothwell wrote: > Hi James, > > Today's linux-next merge of the scsi tree got a conflict in: > > drivers/scsi/ufs/ufshcd.c > > between commit: > > e806402130c9 ("block: split out request-only flags into a new > namespace") > > from the block tree