Hi all,
On Fri, 20 May 2022 15:40:55 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the modules tree got a conflict in:
>
> arch/powerpc/Kconfig
>
> between commit:
>
> b91d4eea5bff ("powerpc: Book3S 64-bit outline-only KASAN support")
>
> from the powerpc tree and commit:
>
> eeaec7801c42 ("powerpc: Select ARCH_WANTS_MODULES_DATA_IN_VMALLOC on book3s/32 and 8xx")
>
> from the modules 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/powerpc/Kconfig
> index dddace39d005,0b7bcfa63d0d..000000000000
> --- a/arch/powerpc/Kconfig
> +++ b/arch/powerpc/Kconfig
> @@@ -158,7 -157,7 +158,8 @@@ config PP
> select ARCH_WANT_IPC_PARSE_VERSION
> select ARCH_WANT_IRQS_OFF_ACTIVATE_MM
> select ARCH_WANT_LD_ORPHAN_WARN
> + select ARCH_WANTS_MODULES_DATA_IN_VMALLOC if PPC_BOOK3S_32 || PPC_8xx
> + select ARCH_WANTS_NO_INSTR
> select ARCH_WEAK_RELEASE_ACQUIRE
> select BINFMT_ELF
> select BUILDTIME_TABLE_SORT
This is now a conflict between the powerpc tree and Linus' tree.
--
Cheers,
Stephen Rothwell
Attachment:
pgp3lT02GZGvA.pgp
Description: OpenPGP digital signature
