linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the printk tree with Linus' tree
@ 2024-05-29  1:28 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2024-05-29  1:28 UTC (permalink / raw)
  To: Petr Mladek
  Cc: Greg Kroah-Hartman, John Ogness, Linux Kernel Mailing List,
	Linux Next Mailing List, Shimoyashiki Taichi, Sreenath Vijayan

[-- 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 --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* linux-next: manual merge of the printk tree with Linus' tree
@ 2024-05-29  1:31 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2024-05-29  1:31 UTC (permalink / raw)
  To: Petr Mladek
  Cc: Greg Kroah-Hartman, Jiri Slaby (SUSE),
	John Ogness, Linux Kernel Mailing List, Linux Next Mailing List

[-- 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 --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* linux-next: manual merge of the printk tree with Linus' tree
@ 2019-04-09 23:34 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2019-04-09 23:34 UTC (permalink / raw)
  To: Petr Mladek
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Sakari Ailus,
	Mike Rapoport, Andrew Morton

[-- Attachment #1: Type: text/plain, Size: 800 bytes --]

Hi all,

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

  mm/memblock.c

between commit:

  26fb3dae0a1e ("memblock: drop memblock_alloc_*_nopanic() variants")

from Linus' tree and commit:

  d75f773c86a2 ("treewide: Switch printk users from %pf and %pF to %ps and %pS, respectively")

from the printk tree.

I fixed it up (the former removed the code changed by part of the latter)
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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* linux-next: manual merge of the printk tree with Linus' tree
@ 2019-04-09 23:29 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2019-04-09 23:29 UTC (permalink / raw)
  To: Petr Mladek
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Chuck Lever,
	Anna Schumaker

[-- Attachment #1: Type: text/plain, Size: 1494 bytes --]

Hi all,

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

  include/trace/events/sunrpc.h

between commit:

  6f701383368d ("SUNRPC: Display symbolic flag names in RPC trace events")

from Linus' tree and commit:

  d75f773c86a2 ("treewide: Switch printk users from %pf and %pF to %ps and %pS, respectively")

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/trace/events/sunrpc.h
index 7e899e635d33,7b8b987d332e..000000000000
--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@@ -146,10 -102,10 +146,10 @@@ DECLARE_EVENT_CLASS(rpc_task_running
  		__entry->flags = task->tk_flags;
  		),
  
- 	TP_printk("task:%u@%d flags=%s runstate=%s status=%d action=%pf",
 -	TP_printk("task:%u@%d flags=%4.4x state=%4.4lx status=%d action=%ps",
++	TP_printk("task:%u@%d flags=%s runstate=%s status=%d action=%ps",
  		__entry->task_id, __entry->client_id,
 -		__entry->flags,
 -		__entry->runstate,
 +		rpc_show_task_flags(__entry->flags),
 +		rpc_show_runstate(__entry->runstate),
  		__entry->status,
  		__entry->action
  		)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* linux-next: manual merge of the printk tree with Linus' tree
@ 2019-04-09 23:24 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2019-04-09 23:24 UTC (permalink / raw)
  To: Petr Mladek
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Sakari Ailus,
	Joe Perches, Rafael J. Wysocki

[-- Attachment #1: Type: text/plain, Size: 1289 bytes --]

Hi all,

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

  drivers/base/power/main.c

between commit:

  7a5bd1279bce ("PM: Add and use pr_fmt()")

from Linus' tree and commit:

  d75f773c86a2 ("treewide: Switch printk users from %pf and %pF to %ps and %pS, respectively")

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 drivers/base/power/main.c
index f80d298de3fa,c88f56b9ae5b..000000000000
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@@ -2063,7 -2062,7 +2063,7 @@@ EXPORT_SYMBOL_GPL(dpm_suspend_start)
  void __suspend_report_result(const char *function, void *fn, int ret)
  {
  	if (ret)
- 		pr_err("%s(): %pF returns %d\n", function, fn, ret);
 -		printk(KERN_ERR "%s(): %pS returns %d\n", function, fn, ret);
++		pr_err("%s(): %pS returns %d\n", function, fn, ret);
  }
  EXPORT_SYMBOL_GPL(__suspend_report_result);
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* linux-next: manual merge of the printk tree with Linus' tree
@ 2018-05-23 22:37 Mark Brown
  0 siblings, 0 replies; 9+ messages in thread
From: Mark Brown @ 2018-05-23 22:37 UTC (permalink / raw)
  To: Petr Mladek, Andy Shevchenko, Steven Rostedt, Linus Torvalds
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List

[-- Attachment #1: Type: text/plain, Size: 3200 bytes --]

Hi Petr,

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

  lib/vsprintf.c

between commit:

  85f4f12d51397f164 ("vsprintf: Replace memory barrier with static_key for random_ptr_key update")

from Linus' tree and commits:

  558594f3c2a5cd65f ("lib/vsprintf: Move pointer_string() upper)"
  496a9a5f3806d58b1 ("lib/vsprintf: Deduplicate pointer_string()")

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.

diff --cc lib/vsprintf.c
index 23920c5ff728,7649ef4ed7d0..000000000000
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@@ -1655,36 -1644,19 +1654,22 @@@ char *device_node_string(char *buf, cha
  	return widen_string(buf, buf - buf_start, end, spec);
  }
  
- static noinline_for_stack
- char *pointer_string(char *buf, char *end, const void *ptr,
- 		     struct printf_spec spec)
- {
- 	spec.base = 16;
- 	spec.flags |= SMALL;
- 	if (spec.field_width == -1) {
- 		spec.field_width = 2 * sizeof(ptr);
- 		spec.flags |= ZEROPAD;
- 	}
- 
- 	return number(buf, end, (unsigned long int)ptr, spec);
- }
- 
 -static bool have_filled_random_ptr_key __read_mostly;
 +static DEFINE_STATIC_KEY_TRUE(not_filled_random_ptr_key);
  static siphash_key_t ptr_key __read_mostly;
  
 -static void fill_random_ptr_key(struct random_ready_callback *unused)
 +static void enable_ptr_key_workfn(struct work_struct *work)
  {
  	get_random_bytes(&ptr_key, sizeof(ptr_key));
 -	/*
 -	 * have_filled_random_ptr_key==true is dependent on get_random_bytes().
 -	 * ptr_to_id() needs to see have_filled_random_ptr_key==true
 -	 * after get_random_bytes() returns.
 -	 */
 -	smp_mb();
 -	WRITE_ONCE(have_filled_random_ptr_key, true);
 +	/* Needs to run from preemptible context */
 +	static_branch_disable(&not_filled_random_ptr_key);
 +}
 +
 +static DECLARE_WORK(enable_ptr_key_work, enable_ptr_key_workfn);
 +
 +static void fill_random_ptr_key(struct random_ready_callback *unused)
 +{
 +	/* This may be in an interrupt handler. */
 +	queue_work(system_unbound_wq, &enable_ptr_key_work);
  }
  
  static struct random_ready_callback random_ready = {
@@@ -1710,13 -1681,13 +1695,13 @@@ early_initcall(initialize_ptr_random)
  /* Maps a pointer to a 32 bit unique identifier. */
  static char *ptr_to_id(char *buf, char *end, void *ptr, struct printf_spec spec)
  {
+ 	const char *str = sizeof(ptr) == 8 ? "(____ptrval____)" : "(ptrval)";
  	unsigned long hashval;
- 	const int default_width = 2 * sizeof(ptr);
  
 -	if (unlikely(!have_filled_random_ptr_key)) {
 +	if (static_branch_unlikely(&not_filled_random_ptr_key)) {
- 		spec.field_width = default_width;
+ 		spec.field_width = 2 * sizeof(ptr);
  		/* string length must be less than default_width */
- 		return string(buf, end, "(ptrval)", spec);
+ 		return string(buf, end, str, spec);
  	}
  
  #ifdef CONFIG_64BIT

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: linux-next: manual merge of the printk tree with Linus' tree
  2018-01-16  2:04 ` Sergey Senozhatsky
@ 2018-01-16 10:38   ` Petr Mladek
  0 siblings, 0 replies; 9+ messages in thread
From: Petr Mladek @ 2018-01-16 10:38 UTC (permalink / raw)
  To: Sergey Senozhatsky
  Cc: Stephen Rothwell, Linux-Next Mailing List,
	Linux Kernel Mailing List, Tobin C. Harding, Sergey Senozhatsky,
	Joe Perches

On Tue 2018-01-16 11:04:09, Sergey Senozhatsky wrote:
> On (01/16/18 09:23), Stephen Rothwell wrote:
> > Today's linux-next merge of the printk tree got a conflict in:
> > 
> >   scripts/checkpatch.pl
> > 
> > between commit:
> > 
> >   7b1924a1d930 ("vsprintf: add printk specifier %px")
> > 
> > from Linus' tree and commit:
> > 
> >   1df7338ac965 ("checkpatch: add pF/pf deprecation warning")
> > 
> > from the printk tree.
> > 
> > I fixed it up (see below) and can carry the fix as necessary.
> 
> looks correct to me. thanks.

Yup, it looks correct to me as well.

Best Regards,
Petr

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: linux-next: manual merge of the printk tree with Linus' tree
  2018-01-15 22:23 Stephen Rothwell
@ 2018-01-16  2:04 ` Sergey Senozhatsky
  2018-01-16 10:38   ` Petr Mladek
  0 siblings, 1 reply; 9+ messages in thread
From: Sergey Senozhatsky @ 2018-01-16  2:04 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Petr Mladek, Linux-Next Mailing List, Linux Kernel Mailing List,
	Tobin C. Harding, Sergey Senozhatsky, Joe Perches

On (01/16/18 09:23), Stephen Rothwell wrote:
> Today's linux-next merge of the printk tree got a conflict in:
> 
>   scripts/checkpatch.pl
> 
> between commit:
> 
>   7b1924a1d930 ("vsprintf: add printk specifier %px")
> 
> from Linus' tree and commit:
> 
>   1df7338ac965 ("checkpatch: add pF/pf deprecation warning")
> 
> from the printk tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

looks correct to me. thanks.

	-ss

> 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 scripts/checkpatch.pl
> index 31031f10fe56,0bb68e7ff173..000000000000
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@@ -5753,7 -5753,7 +5753,7 @@@ sub process 
>   		        for (my $count = $linenr; $count <= $lc; $count++) {
>   				my $fmt = get_quoted_string($lines[$count - 1], raw_line($count, 0));
>   				$fmt =~ s/%%//g;
> - 				if ($fmt =~ /(\%[\*\d\.]*p(?![\WFfSsBKRraEhMmIiUDdgVCbGNOx]).)/) {
>  -				if ($fmt =~ /(\%[\*\d\.]*p(?![\WSsBKRraEhMmIiUDdgVCbGNO]).)/) {
> ++				if ($fmt =~ /(\%[\*\d\.]*p(?![\WSsBKRraEhMmIiUDdgVCbGNOx]).)/) {
>   					$bad_extension = $1;
>   					last;
>   				}
> 

^ permalink raw reply	[flat|nested] 9+ messages in thread

* linux-next: manual merge of the printk tree with Linus' tree
@ 2018-01-15 22:23 Stephen Rothwell
  2018-01-16  2:04 ` Sergey Senozhatsky
  0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2018-01-15 22:23 UTC (permalink / raw)
  To: Petr Mladek
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Tobin C. Harding, Sergey Senozhatsky, Joe Perches

Hi Petr,

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

  scripts/checkpatch.pl

between commit:

  7b1924a1d930 ("vsprintf: add printk specifier %px")

from Linus' tree and commit:

  1df7338ac965 ("checkpatch: add pF/pf deprecation warning")

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 scripts/checkpatch.pl
index 31031f10fe56,0bb68e7ff173..000000000000
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@@ -5753,7 -5753,7 +5753,7 @@@ sub process 
  		        for (my $count = $linenr; $count <= $lc; $count++) {
  				my $fmt = get_quoted_string($lines[$count - 1], raw_line($count, 0));
  				$fmt =~ s/%%//g;
- 				if ($fmt =~ /(\%[\*\d\.]*p(?![\WFfSsBKRraEhMmIiUDdgVCbGNOx]).)/) {
 -				if ($fmt =~ /(\%[\*\d\.]*p(?![\WSsBKRraEhMmIiUDdgVCbGNO]).)/) {
++				if ($fmt =~ /(\%[\*\d\.]*p(?![\WSsBKRraEhMmIiUDdgVCbGNOx]).)/) {
  					$bad_extension = $1;
  					last;
  				}

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2024-05-29  1:31 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-05-29  1:28 linux-next: manual merge of the printk tree with Linus' tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2024-05-29  1:31 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

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).