On 12/13/18 7:23 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the block tree got a conflict in:
>
> drivers/scsi/sd.c
>
> between commit:
>
> 61cce6f6eece ("scsi: sd: use mempool for discard special page")
>
> from the scsi-fixes tree and commit:
>
>
Hi all,
Today's linux-next merge of the block tree got a conflict in:
drivers/scsi/sd.c
between commit:
61cce6f6eece ("scsi: sd: use mempool for discard special page")
from the scsi-fixes tree and commit:
159b2cbf59f4 ("scsi: return blk_status_t from scsi_init_io and
->init_command")
2 matches
Mail list logo