From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Ralf Baechle <ralf@linux-mips•org>,
James Hogan <james.hogan@imgtec•com>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Ard Biesheuvel <ard.biesheuvel@linaro•org>,
Paul Burton <paul.burton@mips•com>
Subject: linux-next: manual merge of the akpm-current tree with the mips tree
Date: Wed, 22 Aug 2018 12:02:18 +1000 [thread overview]
Message-ID: <20180822120218.44cecef5@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1803 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/Kconfig
between commit:
04f264d3a8b0 ("compiler.h: Allow arch-specific asm/compiler.h")
from the mips tree and commit:
7358e371b0ef ("arch: enable relative relocations for arm64, power and x86")
from the akpm-current 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.
--
Cheers,
Stephen Rothwell
diff --cc arch/Kconfig
index 526a57457594,4426e9687d89..000000000000
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@@ -848,14 -841,16 +848,24 @@@ config REFCOUNT_FUL
against various use-after-free conditions that can be used in
security flaw exploits.
+config HAVE_ARCH_COMPILER_H
+ bool
+ help
+ An architecture can select this if it provides an
+ asm/compiler.h header that should be included after
+ linux/compiler-*.h in order to override macro definitions that those
+ headers generally provide.
+
+ config HAVE_ARCH_PREL32_RELOCATIONS
+ bool
+ help
+ May be selected by an architecture if it supports place-relative
+ 32-bit relocations, both in the toolchain and in the module loader,
+ in which case relative references can be used in special sections
+ for PCI fixup, initcalls etc which are only half the size on 64 bit
+ architectures, and don't require runtime relocation on relocatable
+ kernels.
+
source "kernel/gcov/Kconfig"
source "scripts/gcc-plugins/Kconfig"
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-08-22 2:02 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-22 2:02 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-05-28 9:29 linux-next: manual merge of the akpm-current tree with the mips tree Stephen Rothwell
2020-05-29 21:15 ` Andrew Morton
2020-05-29 22:55 ` Stephen Rothwell
2019-05-03 8:59 Stephen Rothwell
2016-02-15 5:03 Stephen Rothwell
2015-06-03 9:33 Stephen Rothwell
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=20180822120218.44cecef5@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=ard.biesheuvel@linaro$(echo .)org \
--cc=james.hogan@imgtec$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=paul.burton@mips$(echo .)com \
--cc=ralf@linux-mips$(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