linux-kernel - Re: linux-next: manual merge of the scsi-mkp tree with Linus' 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]

Message-ID: <yq1wnors5ul.fsf@ca-mkp.ca.oracle.com>
Date:   Wed, 11 Aug 2021 23:25:20 -0400
From:   "Martin K. Petersen" <martin.petersen@...cle.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     "Martin K. Petersen" <martin.petersen@...cle.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Sreekanth Reddy <sreekanth.reddy@...adcom.com>
Subject: Re: linux-next: manual merge of the scsi-mkp tree with Linus' tree


Stephen,

> Today's linux-next merge of the scsi-mkp tree got conflicts in:
>
>   drivers/scsi/mpt3sas/mpt3sas_base.c
>   drivers/scsi/mpt3sas/mpt3sas_base.h

Fixed this up. Thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering