Received-SPF: pass (google.com: domain of linux-kernel+bounces-139738-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Thu, 11 Apr 2024 14:17:11 +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: Re: linux-next: manual merge of the tty tree with the tty.current
 tree
Message-ID: <20240411141711.63dbd8e9@canb.auug.org.au>
In-Reply-To: <20240411135735.58de7090@canb.auug.org.au>
References: <20240411135735.58de7090@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/LucqT9vVJzOtGmPApdG1c4/";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/LucqT9vVJzOtGmPApdG1c4/
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Thu, 11 Apr 2024 13:57:35 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the tty tree got a conflict in:
>=20
>   drivers/tty/serial/serial_core.c
>=20
> between commit:
>=20
>   9cf7ea2eeb74 ("serial: core: Clearing the circular buffer before NULLif=
ying it")
>=20
> from the tty.current tree and commit:
>=20
>   1788cf6a91d9 ("tty: serial: switch from circ_buf to kfifo")
>=20
> from the tty tree.
>=20
> 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
> --=20
> Cheers,
> Stephen Rothwell
>=20
> 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);

That didn't work :-(

So I have used the below resolution instead.
--=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;
++	kfifo_reset(&state->port.xmit_fifo);
+ 	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_/LucqT9vVJzOtGmPApdG1c4/
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYXZEcACgkQAVBC80lX
0Gx8/Qf/cqHcVPGJ9s7tLH2/0VRucyqoSHABzLgtK0ygtegijIyJuOI+LqsiLRP4
ETtOyPzeRmBRlw0cN9cB79y8xpaWjHD9Z8pjcz/xQS2Ze8jH5F2NYpZDEowMdIxG
2qQMuqjp6kkqnFu/uNDWz/Dgvf4ubzKH5tCQe9JdGC04qsh9TUcy4GCJQHUfwOH8
9oWJgZhNqj7K4YV4viVIXBIgVbY6CRnnjMzNuKpJrpI37rIkyADHOZscZE+Y0ffW
CLh3k70RpN4IqW7t8F4bQNPp0oxvyv+NYTJXHhGdBPs972g0v9+C/m/oXTe3Z7TE
9SgQiBdLj5J8KUL0E54usnoMWwiw+g==
=J0Ha
-----END PGP SIGNATURE-----

--Sig_/LucqT9vVJzOtGmPApdG1c4/--