From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Max Filippov <jcmvbkbc@gmail.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Kees Cook <keescook@chromium.org>, Borislav Petkov <bp@suse.de>
Subject: linux-next: manual merge of the tip tree with the xtensa tree
Date: Mon, 11 Nov 2019 14:31:54 +1100 [thread overview]
Message-ID: <20191111143154.13b0a7ac@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1468 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/xtensa/kernel/vmlinux.lds.S
between commit:
158b6b99ba7b ("xtensa: merge .fixup with .text")
from the xtensa tree and commits:
eaf937075c9a ("vmlinux.lds.h: Move NOTES into RO_DATA")
94174c9b71c6 ("xtensa: Move EXCEPTION_TABLE to RO_DATA segment")
from the tip 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/xtensa/kernel/vmlinux.lds.S
index c64abc15d38f,0043d5858f14..000000000000
--- a/arch/xtensa/kernel/vmlinux.lds.S
+++ b/arch/xtensa/kernel/vmlinux.lds.S
@@@ -124,17 -126,16 +126,15 @@@ SECTION
. = ALIGN(16);
- RODATA
+ RO_DATA(4096)
- EXCEPTION_TABLE(16)
- NOTES
- /* Relocation table */
-
- .fixup : { *(.fixup) }
-
/* Data section */
+#ifdef CONFIG_XIP_KERNEL
+ INIT_TEXT_SECTION(PAGE_SIZE)
+#else
_sdata = .;
- RW_DATA_SECTION(XCHAL_ICACHE_LINESIZE, PAGE_SIZE, THREAD_SIZE)
+ RW_DATA(XCHAL_ICACHE_LINESIZE, PAGE_SIZE, THREAD_SIZE)
_edata = .;
/* Initialization code and data: */
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-11-11 3:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-11 3:31 Stephen Rothwell [this message]
2019-11-11 10:04 ` linux-next: manual merge of the tip tree with the xtensa tree Borislav Petkov
2019-11-26 21:33 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2014-01-13 3:26 Stephen Rothwell
2014-01-13 3:38 ` czankel
2014-01-13 3:26 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=20191111143154.13b0a7ac@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=bp@suse.de \
--cc=hpa@zytor.com \
--cc=jcmvbkbc@gmail.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/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).