Subject: linux-next: manual merge of the rust tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 12 Jul 2021 10:37:15 +1000

Hi all,

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

  include/linux/kallsyms.h

between commit:

  9294523e3768 ("module: add printk formats to add module build ID to stacktraces")

from Linus' tree and commit:

  f2f6175186f4 ("kallsyms: increase maximum kernel symbol length to 512")

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 include/linux/kallsyms.h
index a1d6fc82d7f0,5cdc6903abca..000000000000
--- a/include/linux/kallsyms.h
+++ b/include/linux/kallsyms.h
@@@ -15,11 -14,9 +15,11 @@@
  
  #include <asm/sections.h>
  
- #define KSYM_NAME_LEN 128
+ #define KSYM_NAME_LEN 512
 -#define KSYM_SYMBOL_LEN (sizeof("%s+%#lx/%#lx [%s]") + (KSYM_NAME_LEN - 1) + \
 -			 2*(BITS_PER_LONG*3/10) + (MODULE_NAME_LEN - 1) + 1)
 +#define KSYM_SYMBOL_LEN (sizeof("%s+%#lx/%#lx [%s %s]") + \
 +			(KSYM_NAME_LEN - 1) + \
 +			2*(BITS_PER_LONG*3/10) + (MODULE_NAME_LEN - 1) + \
 +			(BUILD_ID_SIZE_MAX * 2) + 1)
  
  struct cred;
  struct module;