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]

Date:   Mon, 14 Feb 2022 08:57:53 +0000
From:   John Garry <john.garry@...wei.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        "Martin K. Petersen" <martin.petersen@...cle.com>
CC:     Ajish Koshy <Ajish.Koshy@...rochip.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Viswas G <Viswas.G@...rochip.com>
Subject: Re: linux-next: manual merge of the scsi-mkp tree with Linus' tree

On 14/02/2022 03:29, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the scsi-mkp tree got conflicts in:
> 
>    drivers/scsi/pm8001/pm8001_hwi.c
>    drivers/scsi/pm8001/pm80xx_hwi.c
> 
> between commit:
> 
>    c26b85ea1636 ("scsi: pm80xx: Fix double completion for SATA devices")
> 
> from Linus' tree and commit:
> 
>    26fc0ea74fcb ("scsi: libsas: Drop SAS_TASK_AT_INITIATOR")
> 
> from the scsi-mkp tree.
> 
> I fixed it up (the former removed the code modified by the latter) and
> can carry the fix as necessary. This is now fixed as far as linux-next
> is concerned, but any non trivial conflicts should be mentioned to your
> upstream maintainer when your tree is submitted for merging.  You may
> also want to consider cooperating with the maintainer of the conflicting
> tree to minimise any particularly complex conflicts.
> 

Thanks for the heads up. So, yeah, your change looks right.

Cheers,
John