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

[Greg KH]

On Fri, Oct 02, 2026 at 07:12:57PM +0100, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the tty tree got a conflict in:
> 
>   drivers/tty/serial/serial_core.c
> 
> between commit:
> 
>   499485a67fbac ("serial: core: fix NULL pointer dereference in serial_core_unregister_port()")
> 
> from the tty.current tree and commit:
> 
>   b290393074a14 ("serial: core: fix NULL/dangling port_dev on failed re-register")
> 
> 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.

Ick, this is messy, sorry.  I'll fix it up next week when I get the
tty.current tree to Linus.

greg k-h