From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
Ralf Baechle <ralf@linux-mips.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Petr Mladek <pmladek@suse.com>,
David Daney <david.daney@cavium.com>
Subject: linux-next: manual merge of the akpm-current tree with the mips tree
Date: Mon, 15 Feb 2016 16:03:53 +1100 [thread overview]
Message-ID: <20160215160353.7a37cf95@canb.auug.org.au> (raw)
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/mips/Kconfig
between commit:
d96927dfa449 ("MIPS: Select CONFIG_HANDLE_DOMAIN_IRQ and make it work.")
from the mips tree and commit:
29afe44a7fbe ("printk/nmi: generic solution for safe printk in NMI")
from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc arch/mips/Kconfig
index e4df64c411b7,56f57816613e..000000000000
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -62,7 -62,7 +62,8 @@@ config MIP
select HAVE_IRQ_TIME_ACCOUNTING
select GENERIC_TIME_VSYSCALL
select ARCH_CLOCKSOURCE_DATA
+ select HANDLE_DOMAIN_IRQ
+ select HAVE_NMI
menu "Machine selection"
next reply other threads:[~2016-02-15 5:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-15 5:03 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
2018-08-22 2:02 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=20160215160353.7a37cf95@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=david.daney@cavium.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pmladek@suse.com \
--cc=ralf@linux-mips.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).