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

Hi all, On Fri, 20 May 2022 15:40:55 +1000 Stephen Rothwell 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:

linux-next: manual merge of the modules tree with the powerpc tree

Hi all, 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/