Re: linux-next: manual merge of the rcu tree with the modules tree

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

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

Hi all,

On Wed, 24 Apr 2024 13:45:51 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the rcu tree got a conflict in:
> 
>   arch/Kconfig
> 
> between commit:
> 
>   3f26835b6c72 ("kprobes: remove dependency on CONFIG_MODULES")
> 
> from the modules tree and commit:
> 
>   900da4d2a57c ("arch: Select new NEED_TASKS_RCU Kconfig option")
> 
> from the rcu 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 arch/Kconfig
> index 0ce4df5afd95,93d5010dfc92..000000000000
> --- a/arch/Kconfig
> +++ b/arch/Kconfig
> @@@ -52,10 -52,10 +52,10 @@@ config GENERIC_ENTR
>   
>   config KPROBES
>   	bool "Kprobes"
>  -	depends on MODULES
>   	depends on HAVE_KPROBES
>   	select KALLSYMS
>  +	select EXECMEM
> - 	select TASKS_RCU if PREEMPTION
> + 	select NEED_TASKS_RCU
>   	help
>   	  Kprobes allows you to trap at almost any kernel address and
>   	  execute a callback function.  register_kprobe() establishes

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

-- 
Cheers,
Stephen Rothwell

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