linux-kernel - Re: linux-next: manual merge of the spi tree with the arm-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: <20220323090337.58419e7f@canb.auug.org.au>
Date:   Wed, 23 Mar 2022 09:03:37 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>
Cc:     Mark Brown <broonie@...nel.org>,
        ARM <linux-arm-kernel@...ts.infradead.org>,
        Jonathan Cameron <Jonathan.Cameron@...wei.com>,
        Linus Walleij <linus.walleij@...aro.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the spi tree with the arm-soc tree

Hi all,

On Tue, 1 Mar 2022 14:31:36 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the spi tree got a conflict in:
> 
>   arch/arm/mach-pxa/stargate2.c
> 
> between commit:
> 
>   28f74201e37c ("ARM: pxa: remove Intel Imote2 and Stargate 2 boards")
> 
> from the arm-soc tree and commit:
> 
>   31455bbda208 ("spi: pxa2xx_spi: Convert to use GPIO descriptors")
> 
> from the spi tree.
> 
> I fixed it up (I just removed the file) 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.

This is now a conflict between the arm-soc tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped