Subject: Re: linux-next: manual merge of the scsi-mkp tree with the fixes tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 7 Feb 2019 16:51:34 +1100

Hi all,

On Thu, 7 Feb 2019 15:47:47 +1100 Stephen Rothwell <[email-masked]> wrote:
>
> Today's linux-next merge of the scsi-mkp tree got a conflict in:
> 
>   drivers/scsi/osd/osd_initiator.c
> 
> between commit:
> 
>   24648908acac ("scsi: osd: osd_initiator: mark expected switch fall-throughs")

I will remove that from my fixes tree for tomorrow.

-- 
Cheers,
Stephen Rothwell