Received-SPF: pass (google.com: domain of linux-kernel+bounces-193302-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Wed, 29 May 2024 11:31:38 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Petr Mladek <pmladek@suse.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, "Jiri Slaby (SUSE)"
 <jirislaby@kernel.org>, John Ogness <john.ogness@linutronix.de>, 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 printk tree with Linus' tree
Message-ID: <20240529113138.323f48d6@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/id9/qOf4mqjq9Ewt487Rki=";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

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

  include/linux/serial_core.h

between commit:

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

from Linus' tree and commit:

  e18c650e4653 ("serial: core: Implement processing in port->lock wrapper")

from the printk 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 include/linux/serial_core.h
index 8cb65f50e830,fe91234d5b7c..000000000000
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@@ -11,6 -11,9 +11,8 @@@
  #include <linux/compiler.h>
  #include <linux/console.h>
  #include <linux/interrupt.h>
 -#include <linux/circ_buf.h>
+ #include <linux/lockdep.h>
+ #include <linux/printk.h>
  #include <linux/spinlock.h>
  #include <linux/sched.h>
  #include <linux/tty.h>

--Sig_/id9/qOf4mqjq9Ewt487Rki=
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZWhXsACgkQAVBC80lX
0GwGNQf/bJqM0AARD5DyUy94FVT9yp+dc+Y+/qHdNghnd326ijfjKqNToeBl6Qzg
pQStHytYW3i9WJer7hbNIiqIPXtIpeKReQm1Q94fAsH50FmUejiHUw+XY1x0iHL0
iHUN0MbXVw6Ad+f9FO6XPXOAQA7hQqFXqlniWtsNm3m6bOGcBoscLE3cc+QdnETB
xe2AgQqIFvVHbJnbnD3CPbi7KI6x0IHlJzlgAYJ4lb651r1ovzYYq/HIgz9ZjjBT
qS3lfR2FW2zh9aGe1SKyDmSn6QtAvEWXyYwqP83/emBp1D3ZDLNA+pA+WsLq3uh+
pQtv9WMtJHGlHn4nSwdXqpQOyE+1kg==
=TyRp
-----END PGP SIGNATURE-----

--Sig_/id9/qOf4mqjq9Ewt487Rki=--