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: <yq1sewgoeb8.fsf@ca-mkp.ca.oracle.com>
Date: Wed, 10 Jul 2024 22:26:44 -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>,
        Nathan Chancellor <nathan@...nel.org>, Tomas Henzl <thenzl@...hat.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 a conflict in:
>
>   drivers/scsi/mpi3mr/mpi3mr_transport.c

Now resolved. Thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering