From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Michael Ellerman <mpe@ellerman•id.au>
Cc: Luis Chamberlain <mcgrof@kernel•org>,
PowerPC <linuxppc-dev@lists•ozlabs.org>,
Christophe Leroy <christophe.leroy@csgroup•eu>,
Daniel Axtens <dja@axtens•net>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Paul Mackerras <paulus@ozlabs•org>
Subject: Re: linux-next: manual merge of the modules tree with the powerpc tree
Date: Sat, 28 May 2022 11:38:59 +1000 [thread overview]
Message-ID: <20220528113859.297d7b9c@canb.auug.org.au> (raw)
In-Reply-To: <20220520154055.7f964b76@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1477 bytes --]
Hi all,
On Fri, 20 May 2022 15:40:55 +1000 Stephen Rothwell <sfr@canb•auug.org.au> 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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2022-05-28 1:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-20 5:40 linux-next: manual merge of the modules tree with the powerpc tree Stephen Rothwell
2022-05-28 1:38 ` Stephen Rothwell [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220528113859.297d7b9c@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=christophe.leroy@csgroup$(echo .)eu \
--cc=dja@axtens$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mcgrof@kernel$(echo .)org \
--cc=mpe@ellerman$(echo .)id.au \
--cc=paulus@ozlabs$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox