Received-SPF: pass (google.com: domain of linux-kernel+bounces-159512-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Fri, 26 Apr 2024 14:55:40 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>, Andrew Morton <akpm@linux-foundation.org>
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 mm tree
Message-ID: <20240426145540.1593f8f4@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/5ixbUIkBKNp7xwV06/Sd0+1";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/5ixbUIkBKNp7xwV06/Sd0+1
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  include/linux/kfifo.h
  lib/kfifo.c

between commit:

  a8372870a0ae ("kfifo: don't use "proxy" headers")

from the mm-nonmm-unstable branch of the mm tree and commit:

  d52b761e4b1a ("kfifo: add kfifo_dma_out_prepare_mapped()")

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 include/linux/kfifo.h
index 6b28d642f332,d613748de7ff..000000000000
--- a/include/linux/kfifo.h
+++ b/include/linux/kfifo.h
@@@ -36,15 -36,11 +36,16 @@@
   * to lock the reader.
   */
 =20
 +#include <linux/array_size.h>
+ #include <linux/dma-mapping.h>
 -#include <linux/kernel.h>
  #include <linux/spinlock.h>
  #include <linux/stddef.h>
 -#include <linux/scatterlist.h>
 +#include <linux/types.h>
 +
 +#include <asm/barrier.h>
 +#include <asm/errno.h>
 +
 +struct scatterlist;
 =20
  struct __kfifo {
  	unsigned int	in;
diff --cc lib/kfifo.c
index 15acdee4a8f3,75ce9225548a..000000000000
--- a/lib/kfifo.c
+++ b/lib/kfifo.c
@@@ -5,13 -5,14 +5,14 @@@
   * Copyright (C) 2009/2010 Stefani Seibold <stefani@seibold.net>
   */
 =20
 -#include <linux/kernel.h>
+ #include <linux/dma-mapping.h>
 -#include <linux/export.h>
 -#include <linux/slab.h>
  #include <linux/err.h>
 -#include <linux/log2.h>
 -#include <linux/uaccess.h>
 +#include <linux/export.h>
  #include <linux/kfifo.h>
 +#include <linux/log2.h>
 +#include <linux/scatterlist.h>
 +#include <linux/slab.h>
 +#include <linux/uaccess.h>
 =20
  /*
   * internal helper to calculate the unused elements in a fifo

--Sig_/5ixbUIkBKNp7xwV06/Sd0+1
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYrM8wACgkQAVBC80lX
0Gy9NAgApMpBJj/Cf+zFbey4dg/jd06Lu9A8Yx/rgjmDGql3CrAgwxdIdj5x9Reo
HJ3YEDqf4NcMxt9F4OyZo0qa/K69/0Fy2sfosNWEtZbhHTruU7shWTOOJwDUniDk
KF83Y8xaC/W2tF3IvGQREdnqjmCIdpbnD+RSgcbfXpxobxyWdgaHNE0XRkun7dWC
bY206eoKUBfKoZ7vQRq9o2lkbPH6zJV43ZClm4DCK3WSUFp6v3N68yQybuLpMxg+
mxjNG1UwIyVf3xcxbv1dqqez0lZMRISRf+7pduLDtKRU4tWwGhuVY4i03Ha84X3Q
i56VNAGEAk3kHC6b5rHMr5Ub3/6n0g==
=W0Pj
-----END PGP SIGNATURE-----

--Sig_/5ixbUIkBKNp7xwV06/Sd0+1--