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

Stephen Rothwell
2024-11-21T00:53:23Z

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

Hi all,

On Tue, 12 Nov 2024 13:01:36 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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.
>
>
> 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;
>

This is now a conflict between the kbuild tree and Linus' tree.

--
Cheers,
Stephen Rothwell

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