Re: linux-next: manual merge of the tty tree with the net-next tree

[Greg KH]

On Wed, Aug 09, 2023 at 01:37:23PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tty tree got a conflict in:
> 
>   arch/powerpc/sysdev/fsl_soc.c
> 
> between commit:
> 
>   62e106c802c5 ("net: fs_enet: Remove stale prototypes from fsl_soc.c")
> 
> from the net-next tree and commit:
> 
>   80a8f487b9ba ("serial: cpm_uart: Remove stale prototype in powerpc/fsl_soc.c")
> 
> 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