From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Petr Mladek <pmladek@suse•com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation•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>,
Shimoyashiki Taichi <taichi.shimoyashiki@sony•com>,
Sreenath Vijayan <sreenath.vijayan@sony•com>
Subject: linux-next: manual merge of the printk tree with Linus' tree
Date: Wed, 29 May 2024 11:28:49 +1000 [thread overview]
Message-ID: <20240529112849.74718b45@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2130 bytes --]
Hi all,
Today's linux-next merge of the printk tree got a conflict in:
include/linux/printk.h
between commit:
693f75b91a91 ("printk: Add function to replay kernel log on consoles")
from Linus' tree and commits:
7e4289a0c15f ("nbcon: Add API to acquire context for non-printing operations")
8a192e951d8a ("printk: nbcon: Add unsafe flushing on panic")
dc0f096fb7aa ("printk: Coordinate direct printing in panic")
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/printk.h
index 40afab23881a,69f40a71c438..000000000000
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@@ -195,7 -195,10 +198,11 @@@ void show_regs_print_info(const char *l
extern asmlinkage void dump_stack_lvl(const char *log_lvl) __cold;
extern asmlinkage void dump_stack(void) __cold;
void printk_trigger_flush(void);
+void console_replay_all(void);
+ void printk_legacy_allow_panic_sync(void);
+ extern bool nbcon_device_try_acquire(struct console *con);
+ extern void nbcon_device_release(struct console *con);
+ void nbcon_atomic_flush_unsafe(void);
#else
static inline __printf(1, 0)
int vprintk(const char *s, va_list args)
@@@ -275,9 -278,24 +282,27 @@@ static inline void dump_stack(void
static inline void printk_trigger_flush(void)
{
}
+static inline void console_replay_all(void)
+{
+}
+
+ static inline void printk_legacy_allow_panic_sync(void)
+ {
+ }
+
+ static inline bool nbcon_device_try_acquire(struct console *con)
+ {
+ return false;
+ }
+
+ static inline void nbcon_device_release(struct console *con)
+ {
+ }
+
+ static inline void nbcon_atomic_flush_unsafe(void)
+ {
+ }
+
#endif
bool this_cpu_in_panic(void);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-05-29 1:28 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-29 1:28 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-05-29 1:31 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=20240529112849.74718b45@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=gregkh@linuxfoundation$(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 \
--cc=sreenath.vijayan@sony$(echo .)com \
--cc=taichi.shimoyashiki@sony$(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