linux-next: manual merge of the rust tree with the printk tree

linux-next: manual merge of the rust tree with the printk tree

[Stephen Rothwell]

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

Hi all,

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

  kernel/printk/printk.c

between commit:

  cf5b0208fda4 ("printk: introduce CONSOLE_LOG_MAX")

from the printk tree and commit:

  fd1e637b9b4b ("Rust: Kernel crate")

from the rust 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 kernel/printk/printk.c
index 421c35571797,d13be89530c4..000000000000
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@@ -394,11 -411,8 +394,12 @@@ static struct latched_seq clear_seq = 
  #define PREFIX_MAX		32
  #endif
  
 +/* the maximum size of a formatted record (i.e. with prefix added per line) */
 +#define CONSOLE_LOG_MAX		1024
 +
 +/* the maximum size allowed to be reserved for a record */
+ /* Keep in sync with rust/kernel/print.rs */
 -#define LOG_LINE_MAX		(1024 - PREFIX_MAX)
 +#define LOG_LINE_MAX		(CONSOLE_LOG_MAX - PREFIX_MAX)
  
  #define LOG_LEVEL(v)		((v) & 0x07)
  #define LOG_FACILITY(v)		((v) >> 3 & 0xff)

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