Hi all,
Today's linux-next merge of the scsi-mkp tree got a conflict in:
drivers/scsi/sg.c
between commit:
8eeed0b554b9 ("block: remove unnecessary argument from blk_execute_rq_nowait")
from the block tree and vaious commits from the scsi-mkp tree.
I fixed it up (see below) and can carry
Hi all,
Today's linux-next merge of the scsi-mkp tree got a conflict in:
include/linux/blkdev.h
between commit:
eca7abf31abb ("block: queue flag cleanup")
from the block tree and commit:
8b3238cabd50 ("scsi: block: remove bidi support")
from the scsi-mkp tree.
I fixed it up (see below
Hi all,
Today's linux-next merge of the scsi-mkp tree got a conflict in:
drivers/scsi/sd.c
between commit:
81d926e8b552 ("sd: split sd_setup_discard_cmnd")
from the block tree and commit:
7529fbb0080d ("scsi: sd: Fix function descriptions")
from the scsi-mkp tree.
I fixed it up (I jus
Hi Martin,
On Fri, 11 Nov 2016 14:55:24 -0500 "Martin K. Petersen"
wrote:
>
> In any case. It seems like the fact that the two SCSI trees may be out
> of sync could be an ongoing problem. So maybe you should just drop my
> tree again. I was just hoping to get visibility into potential merge
> pr
> "Stephen" == Stephen Rothwell writes:
Stephen,
Stephen> This latter commit also exists as commit 2266d5678ad1 in the
Stephen> scsi tree, but unfortunately, the scsi-mkp tree was rebased
Stephen> overnight, so now the two patches are not the same commit :-( A
Stephen> significant path of wh
Hi Martin,
Today's linux-next merge of the scsi-mkp tree got conflicts 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:
dcea0bfbc4cb ("scsi: ufs: fix sense buffer size to 18 bytes")
f
6 matches
Mail list logo
