linux-kernel - Re: linux-next: manual merge of the net-next 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

[an error occurred while processing this directive]

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <YyqV0IrItyL/70BJ@euler>
Date:   Tue, 20 Sep 2022 21:40:48 -0700
From:   Colin Foster <colin.foster@...advantage.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>,
        Horatiu Vultur <horatiu.vultur@...rochip.com>,
        Lee Jones <lee@...nel.org>,
        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 net-next tree with Linus' tree

On Wed, Sep 21, 2022 at 11:00:32AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the net-next tree got a conflict in:
> 
>   drivers/pinctrl/pinctrl-ocelot.c
> 
> between commit:
> 
>   c297561bc98a ("pinctrl: ocelot: Fix interrupt controller")
> 
> from Linus' tree and commit:
> 
>   181f604b33cd ("pinctrl: ocelot: add ability to be used in a non-mmio configuration")
> 
> from the net-next 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.

Hi Stephen,

I can see how this conflict came about. If there is anything specific I
can do to try to recognize and avoid these in the future, please let me
know. And other subsystem maintainers, please let me know if there is
anything I have to do / should have done.

Thanks, and apologies.

Colin Foster