From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Max Filippov <jcmvbkbc@gmail•com>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Adam Borowski <kilobyte@angband•pl>,
Jonathan Corbet <corbet@lwn•net>
Subject: linux-next: manual merge of the xtensa tree with Linus' tree
Date: Tue, 19 Dec 2017 11:32:29 +1100 [thread overview]
Message-ID: <20171219113229.29dc8cd1@canb.auug.org.au> (raw)
Hi Max,
Today's linux-next merge of the xtensa tree got a conflict in:
Documentation/features/debug/KASAN/arch-support.txt
between commit:
d19cd4bb2343 ("Documentation/features/KASAN: mark KASAN as supported only on 64-bit on x86")
from Linus' tree and commit:
c633544a6154 ("xtensa: add support for KASAN")
from the xtensa 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
7d580ca2ecda7312f7f328dd64ec34bf75e811f5
diff --cc Documentation/features/debug/KASAN/arch-support.txt
index f377290fe48e,8abb013db8d1..3406fae833c3
--- a/Documentation/features/debug/KASAN/arch-support.txt
+++ b/Documentation/features/debug/KASAN/arch-support.txt
@@@ -34,6 -34,6 +34,6 @@@
| tile: | TODO |
| um: | TODO |
| unicore32: | TODO |
- | x86: | ok |
+ | x86: | ok | 64-bit only
- | xtensa: | TODO |
+ | xtensa: | ok |
-----------------------
next reply other threads:[~2017-12-19 0:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-19 0:32 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-11-15 23:39 linux-next: manual merge of the xtensa tree with Linus' tree Stephen Rothwell
2016-09-29 0:01 Stephen Rothwell
2012-12-14 0:06 Stephen Rothwell
2012-10-21 23:40 Stephen Rothwell
2012-10-21 23:57 ` Chris Zankel
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=20171219113229.29dc8cd1@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=corbet@lwn$(echo .)net \
--cc=jcmvbkbc@gmail$(echo .)com \
--cc=kilobyte@angband$(echo .)pl \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.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