linux-kernel - Re: linux-next: manual merge of the crypto tree with the riscv-soc 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: <Y9d3qWZYlULl8Vxq@wendy>
Date:   Mon, 30 Jan 2023 07:54:17 +0000
From:   Conor Dooley <conor.dooley@...rochip.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
CC:     Herbert Xu <herbert@...dor.apana.org.au>,
        Linux Crypto List <linux-crypto@...r.kernel.org>,
        Jenny Zhang <jenny.zhang@...rfivetech.com>,
        Jia Jie Ho <jiajie.ho@...rfivetech.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Walker Chen <walker.chen@...rfivetech.com>
Subject: Re: linux-next: manual merge of the crypto tree with the riscv-soc
 tree

On Mon, Jan 30, 2023 at 11:41:28AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the crypto tree got a conflict in:
> 
>   MAINTAINERS
> 
> between commit:
> 
>   08b9a94e8654 ("soc: starfive: Add StarFive JH71XX pmu driver")
> 
> from the riscv-soc tree and commit:
> 
>   c388f458bc34 ("hwrng: starfive - Add TRNG driver for StarFive SoC")
> 
> from the crypto tree.

> Note, please keep MAINTAINERS file entries in alphabetical order.

Huh, good point. I didn't notice the PMU entry was added out of order.

> I fixed it up (see below) 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 Stephen

Download attachment "signature.asc" of type "application/pgp-signature" (229 bytes)