linux-kernel - Re: linux-next: manual merge of the regulator 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: <20190306092714.23cf72d6@canb.auug.org.au>
Date:   Wed, 6 Mar 2019 09:27:14 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
        ARM <linux-arm-kernel@...ts.infradead.org>
Cc:     Mark Brown <broonie@...nel.org>,
        Liam Girdwood <lgirdwood@...il.com>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Daniel Mack <daniel@...que.org>,
        Robert Jarzmik <robert.jarzmik@...e.fr>,
        Linus Walleij <linus.walleij@...aro.org>
Subject: Re: linux-next: manual merge of the regulator tree with the arm-soc
 tree

Hi all,

On Mon, 18 Feb 2019 12:56:27 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the regulator tree got a conflict in:
> 
>   arch/arm/mach-pxa/raumfeld.c
> 
> between commit:
> 
>   0f884f8a090e ("ARM: pxa: remove raumfeld board files and defconfig")
> 
> from the arm-soc tree and commit:
> 
>   01dc79cd6fe7 ("regulator: fixed/gpio: Pull inversion/OD into gpiolib")
> 
> from the regulator tree.
> 
> I fixed it up (the former removed the file, so I did that) 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 Linus' tree and the arm-soc tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped