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
