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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Thu, 7 Feb 2019 07:15:38 -0600
From:   "Gustavo A. R. Silva" <gustavo@...eddedor.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     "Martin K. Petersen" <martin.petersen@...cle.com>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Christoph Hellwig <hch@....de>
Subject: Re: linux-next: manual merge of the scsi-mkp tree with the fixes tree



On 2/7/19 12:15 AM, Stephen Rothwell wrote:
> Hi all,
> 
> On Thu, 7 Feb 2019 16:51:34 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>>
>> On Thu, 7 Feb 2019 15:47:47 +1100 Stephen Rothwell <sfr@...b.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