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
Date: Wed, 29 May 2024 11:31:38 +1000 [thread overview]
Message-ID: <20240529113138.323f48d6@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1192 bytes --]
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.
--
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>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-05-29 1:31 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-29 1:31 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-05-29 1:28 linux-next: manual merge of the printk tree with Linus' tree Stephen Rothwell
2019-04-09 23:34 Stephen Rothwell
2019-04-09 23:29 Stephen Rothwell
2019-04-09 23:24 Stephen Rothwell
2018-05-23 22:37 Mark Brown
2018-01-15 22:23 Stephen Rothwell
2018-01-16 2:04 ` Sergey Senozhatsky
2018-01-16 10:38 ` Petr Mladek
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=20240529113138.323f48d6@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=jirislaby@kernel$(echo .)org \
--cc=john.ogness@linutronix$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=pmladek@suse$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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