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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20241121115319.0285b0a5@canb.auug.org.au>
Date: Thu, 21 Nov 2024 11:53:19 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Masahiro Yamada <masahiroy@...nel.org>
Cc: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...hat.com>,
 "H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org>,
 Han Shen <shenhan@...gle.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Rong Xu <xur@...gle.com>
Subject: Re: linux-next: manual merge of the tip tree with the kbuild tree

Hi all,

On Tue, 12 Nov 2024 13:01:36 +1100 Stephen Rothwell <sfr@...b.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

Content of type "application/pgp-signature" skipped