Received-SPF: pass (google.com: domain of linux-kernel+bounces-139733-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Date: Thu, 11 Apr 2024 13:57:35 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>, Greg Kroah-Hartman
 <gregkh@linuxfoundation.org>, "Jiri Slaby (SUSE)" <jirislaby@kernel.org>,
 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next
 Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the tty tree with the tty.current tree
Message-ID: <20240411135735.58de7090@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/KBcu2OnPzWfoG+guo3smTg.";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/KBcu2OnPzWfoG+guo3smTg.
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the tty tree got a conflict in:

  drivers/tty/serial/serial_core.c

between commit:

  9cf7ea2eeb74 ("serial: core: Clearing the circular buffer before NULLifyi=
ng it")

from the tty.current tree and commit:

  1788cf6a91d9 ("tty: serial: switch from circ_buf to kfifo")

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.

--=20
Cheers,
Stephen Rothwell

diff --cc drivers/tty/serial/serial_core.c
index 2247efe97250,a78ded8c60b5..000000000000
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@@ -1788,9 -1773,9 +1773,10 @@@ static void uart_tty_port_shutdown(stru
  	 * Free the transmit buffer.
  	 */
  	uart_port_lock_irq(uport);
 +	uart_circ_clear(&state->xmit);
- 	buf =3D state->xmit.buf;
- 	state->xmit.buf =3D NULL;
+ 	buf =3D port->xmit_buf;
+ 	port->xmit_buf =3D NULL;
+ 	INIT_KFIFO(port->xmit_fifo);
  	uart_port_unlock_irq(uport);
 =20
  	free_page((unsigned long)buf);

--Sig_/KBcu2OnPzWfoG+guo3smTg.
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYXX68ACgkQAVBC80lX
0Gw33Qf9GVGrFAJTvDWhp1iY7lUIi8ItgiP23HhhrEktUeWw6KxFsmZdXDElZu+J
VprYg+B4FYl/iQmtvIF5dZP/9f/4QeGNwGoVpDGWXzYr5OOjZwQ/vjINgASSmuyw
GIzK2vHvg2d/FAS+FsG4ATEXbL1TH3DH89y3QEnNtrJj8oX+rmAYae/etvjjrYo4
ZxkFy6df/sQG9wLwuIHFHnImiriMZCLvXTHa+8g7ZEvcx3Fs72aya6JqzGWp8uCT
GuRhT6wf8JQFIDTYWlO12YTP6mqbxVWwVzZb/NYVD8LIydt42gpPbSTnQDjwLKpU
iGzi2bbZRGF7qdndNz7qmB2l7PVcwg==
=SwEf
-----END PGP SIGNATURE-----

--Sig_/KBcu2OnPzWfoG+guo3smTg.--