[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20240514134234.5d9f033f@canb.auug.org.au>
Date: Tue, 14 May 2024 13:42:34 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Luis Chamberlain <mcgrof@...nel.org>
Cc: "Paul E. McKenney" <paulmck@...nel.org>, Linux Kernel Mailing List
<linux-kernel@...r.kernel.org>, Linux Next Mailing List
<linux-next@...r.kernel.org>, "Mike Rapoport (IBM)" <rppt@...nel.org>,
"Uladzislau Rezki (Sony)" <urezki@...il.com>
Subject: Re: linux-next: manual merge of the rcu tree with the modules tree
Hi all,
On Wed, 24 Apr 2024 13:45:51 +1000 Stephen Rothwell <sfr@...b.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
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists