linux-next: manual merge of the akpm-current tree with the mips tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the akpm-current tree with the mips tree
Date	2016-02-15 06:10 +0100
Message-ID	<r2jA5-4JA-3@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View 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"

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: manual merge of the akpm-current tree with the mips  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-02-15 06:10 +0100

csiph-web