linux-kernel - Re: linux-next: manual merge of the tty tree with the net-next 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: <2023080917-deafness-fanfare-f6cb@gregkh>
Date:   Wed, 9 Aug 2023 09:54:26 +0200
From:   Greg KH <greg@...ah.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     David Miller <davem@...emloft.net>,
        Jakub Kicinski <kuba@...nel.org>,
        Paolo Abeni <pabeni@...hat.com>,
        Networking <netdev@...r.kernel.org>,
        Christophe Leroy <christophe.leroy@...roup.eu>,
        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 tty tree with the net-next tree

On Wed, Aug 09, 2023 at 01:40:51PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tty tree got conflicts in:
> 
>   arch/powerpc/platforms/8xx/mpc885ads_setup.c
>   arch/powerpc/platforms/8xx/tqm8xx_setup.c
> 
> between commit:
> 
>   33deffc9f19f ("net: fs_enet: Don't include fs_enet_pd.h when not needed")
> 
> from the net-next tree and commit:
> 
>   a833b201d908 ("serial: cpm_uart: Don't include fs_uart_pd.h when not needed")
> 
> from the tty 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.

Fix looks good to me, thanks!

greg k-h