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

[Greg KH]

On Thu, Nov 27, 2025 at 12:09:21PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tty tree got a conflict in:
> 
>   drivers/tty/serial/8250/8250_rsa.c
> 
> between commit:
> 
>   2bf95a9bcb50 ("serial: 8250: Fix 8250_rsa symbol loop")
> 
> from the tty.current tree and commit:
> 
>   37d55c92e9db ("serial: drop SERIAL_8250_DEPRECATED_OPTIONS")
> 
> 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.

Looks good to me, thanks!

greg k-h