linux-next: manual merge of the akpm-current tree with the bpf-next tree

linux-next: manual merge of the akpm-current tree with the bpf-next tree

[Stephen Rothwell]

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

Hi all,

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

  lib/Kconfig.debug

between commit:

  42d9b379e3e1 ("lib/Kconfig.debug: Allow BTF + DWARF5 with pahole 1.21+")

from the bpf-next tree and commit:

  e11ef20106b7 ("Kconfig.debug: make DEBUG_INFO selectable from a choice")

from the akpm-current 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 lib/Kconfig.debug
index f15dd96028b5,efc1a1908e04..000000000000
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -317,6 -339,7 +339,7 @@@ config DEBUG_INFO_BT
  	depends on !DEBUG_INFO_SPLIT && !DEBUG_INFO_REDUCED
  	depends on !GCC_PLUGIN_RANDSTRUCT || COMPILE_TEST
  	depends on BPF_SYSCALL
 -	depends on !DEBUG_INFO_DWARF5
++	depends on !DEBUG_INFO_DWARF5 || PAHOLE_VERSION >= 121
  	help
  	  Generate deduplicated BTF type information from DWARF debug info.
  	  Turning this on expects presence of pahole tool, which will convert

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

linux-next: manual merge of the akpm-current tree with the bpf-next tree

[Stephen Rothwell]

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

Hi all,

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

  include/linux/compiler_types.h

between commit:

  6789ab9668d9 ("compiler_types: Refactor the use of btf_type_tag attribute.")

from the bpf-next tree and commit:

  a7e15f5aee27 ("Documentation/sparse: add hints about __CHECKER__")

from the akpm-current 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/compiler_types.h
index 1bc760ba400c,232dbd97f8b1..000000000000
--- a/include/linux/compiler_types.h
+++ b/include/linux/compiler_types.h
@@@ -4,13 -4,7 +4,14 @@@
  
  #ifndef __ASSEMBLY__
  
 +#if defined(CONFIG_DEBUG_INFO_BTF) && defined(CONFIG_PAHOLE_HAS_BTF_TAG) && \
 +	__has_attribute(btf_type_tag)
 +# define BTF_TYPE_TAG(value) __attribute__((btf_type_tag(#value)))
 +#else
 +# define BTF_TYPE_TAG(value) /* nothing */
 +#endif
 +
+ /* sparse defines __CHECKER__; see Documentation/dev-tools/sparse.rst */
  #ifdef __CHECKER__
  /* address spaces */
  # define __kernel	__attribute__((address_space(0)))

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