linux-next: manual merge of the tip tree with the kbuild tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

  tools/objtool/check.c

between commits:

  315ad8780a12 ("kbuild: Add AutoFDO support for Clang build")
  0dcc2d106615 ("kbuild: Add Propeller configuration for kernel build")

from the kbuild tree and commit:

  d5173f753750 ("objtool: Exclude __tracepoints data from ENDBR checks")

from the tip 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 tools/objtool/check.c
index 05a0fb4a3d1a,f7586f82b967..000000000000
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@@ -4557,8 -4573,7 +4573,9 @@@ static int validate_ibt(struct objtool_
  		    !strcmp(sec->name, "__jump_table")			||
  		    !strcmp(sec->name, "__mcount_loc")			||
  		    !strcmp(sec->name, ".kcfi_traps")			||
 +		    !strcmp(sec->name, ".llvm.call-graph-profile")	||
 +		    !strcmp(sec->name, ".llvm_bb_addr_map")		||
+ 		    !strcmp(sec->name, "__tracepoints")			||
  		    strstr(sec->name, "__patchable_function_entries"))
  			continue;
  

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