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

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

2019-04-14 Thread Stephen Rothwell
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 ("

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

2019-02-17 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the scsi tree got conflicts in: fs/exofs/ore.c fs/exofs/ore_raid.c between commit: 6dc4f100c175 ("block: allow bio_for_each_segment_all() to iterate over multi-page bvec") from the block tree and commit: 80f2121380ca ("scsi: fs: remove exofs") fro

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

2017-06-20 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the scsi tree got a conflict in: drivers/scsi/scsi_lib.c between commit: ca18d6f769d2 ("block: Make most scsi_req_init() calls implicit") from the block tree and commit: 2dd6fb5957a7 ("scsi: Only add commands to the device command list if required by

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

2017-06-18 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the scsi tree got a conflict in: drivers/scsi/scsi_lib.c between commit: f660174e8bcd ("blk-mq: use the introduced blk_mq_unquiesce_queue()") from the block tree and commits: 551eb598e5ea ("scsi: Split scsi_internal_device_block()") 66483a4a9f34 ("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

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

2016-11-07 Thread Stephen Rothwell
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 and commit: 2266d5678ad1 ("scsi: ufs: fix sense buffer size to 18 bytes") from