linux-kernel - Re: linux-next: manual merge of the tty tree with the tty.current 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: <2025112740-marbling-deem-9037@gregkh>
Date: Thu, 27 Nov 2025 07:52:50 +0100
From: Greg KH <greg@...ah.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>,
	"Jiri Slaby (SUSE)" <jirislaby@...nel.org>,
	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 tty.current
 tree

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