lkml.org 
[lkml]   [2019]   [Feb]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the scsi-mkp tree with the fixes tree
From
Date


On 2/7/19 12:15 AM, Stephen Rothwell wrote:
> Hi all,
>
> On Thu, 7 Feb 2019 16:51:34 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> On Thu, 7 Feb 2019 15:47:47 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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.
>
> And that same patch appears in the kspp-gustavo tree as well ...
>

I will remove it from my tree.

Thanks, Stephen.

--
Gustavo

\
 
 \ /
  Last update: 2019-02-07 14:16    [W:0.042 / U:0.164 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site