From: Michael Ellerman <mpe@ellerman.id.au>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
PowerPC <linuxppc-dev@lists.ozlabs.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Thiago Jung Bauermann <bauerman@linux.ibm.com>,
Peter Collingbourne <pcc@google.com>
Subject: Re: linux-next: manual merge of the powerpc tree with the arm64 tree
Date: Mon, 02 Sep 2019 11:44:43 +1000 [thread overview]
Message-ID: <87lfv7tqt0.fsf@mpe.ellerman.id.au> (raw)
In-Reply-To: <20190902094711.2625ba31@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi all,
>
> Today's linux-next merge of the powerpc tree got a conflict in:
>
> arch/Kconfig
>
> between commit:
>
> 5cf896fb6be3 ("arm64: Add support for relocating the kernel with RELR relocations")
>
> from the arm64 tree and commit:
>
> 0c9c1d563975 ("x86, s390: Move ARCH_HAS_MEM_ENCRYPT definition to arch/Kconfig")
>
> from the powerpc 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.
Thanks.
That conflict seems entirely trivial, but Catalin/Will if it bothers you
I have the conflicting commit in a topic branch based on rc2 which you
could merge to resolve it:
https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?h=topic/mem-encrypt&id=0c9c1d56397518eb823d458b00b06bcccd956794
cheers
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc arch/Kconfig
> index 6f4d3e9bf486,89e2e3f64f79..000000000000
> --- a/arch/Kconfig
> +++ b/arch/Kconfig
> @@@ -932,20 -925,9 +932,23 @@@ config LOCK_EVENT_COUNT
> the chance of application behavior change because of timing
> differences. The counts are reported via debugfs.
>
> +# Select if the architecture has support for applying RELR relocations.
> +config ARCH_HAS_RELR
> + bool
> +
> +config RELR
> + bool "Use RELR relocation packing"
> + depends on ARCH_HAS_RELR && TOOLS_SUPPORT_RELR
> + default y
> + help
> + Store the kernel's dynamic relocations in the RELR relocation packing
> + format. Requires a compatible linker (LLD supports this feature), as
> + well as compatible NM and OBJCOPY utilities (llvm-nm and llvm-objcopy
> + are compatible).
> +
> + config ARCH_HAS_MEM_ENCRYPT
> + bool
> +
> source "kernel/gcov/Kconfig"
>
> source "scripts/gcc-plugins/Kconfig"
next prev parent reply other threads:[~2019-09-02 1:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-01 23:47 linux-next: manual merge of the powerpc tree with the arm64 tree Stephen Rothwell
2019-09-02 1:44 ` Michael Ellerman [this message]
2019-09-02 9:08 ` Catalin Marinas
2019-09-02 10:05 ` Will Deacon
2019-09-02 10:25 ` Michael Ellerman
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=87lfv7tqt0.fsf@mpe.ellerman.id.au \
--to=mpe@ellerman.id.au \
--cc=bauerman@linux.ibm.com \
--cc=catalin.marinas@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=pcc@google.com \
--cc=sfr@canb.auug.org.au \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).