linux-kernel - Re: linux-next: manual merge of the pinctrl 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: <Y49aC6dMyoAMcTkd@smile.fi.intel.com>
Date:   Tue, 6 Dec 2022 17:04:43 +0200
From:   Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Linus Walleij <linus.walleij@...aro.org>,
        Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
        ARM <linux-arm-kernel@...ts.infradead.org>,
        Dmitry Torokhov <dmitry.torokhov@...il.com>,
        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 pinctrl tree with the arm-soc
 tree

On Tue, Dec 06, 2022 at 12:13:36PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the pinctrl tree got a conflict in:
> 
>   drivers/soc/fsl/qe/gpio.c
> 
> between commits:
> 
>   84582f9ed090 ("soc: fsl: qe: Avoid using gpio_to_desc()")
>   66310b5a0fc1 ("soc: fsl: qe: request pins non-exclusively")
> 
> from the arm-soc tree and commit:
> 
>   c9eb6e546a23 ("soc: fsl: qe: Switch to use fwnode instead of of_node")
> 
> from the pinctrl tree.
> 
> 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.

That's correct fix in my opinion. Thank you!

How to avoid conflict and why it's there I have explained here:
https://lore.kernel.org/linux-arm-kernel/Y43ij5rwNLOaztch@smile.fi.intel.com/

-- 
With Best Regards,
Andy Shevchenko