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
Date: Fri, 26 Apr 2024 14:55:40 +1000 [thread overview]
Message-ID: <20240426145540.1593f8f4@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1969 bytes --]
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.
--
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.
*/
+#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;
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>
*/
-#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>
/*
* internal helper to calculate the unused elements in a fifo
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-04-26 4:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-26 4:55 Stephen Rothwell [this message]
2024-04-26 14:51 ` linux-next: manual merge of the tty tree with the mm tree Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240426145540.1593f8f4@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=greg@kroah.com \
--cc=gregkh@linuxfoundation.org \
--cc=jirislaby@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).