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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20160215160353.7a37cf95@canb.auug.org.au>
Date:	Mon, 15 Feb 2016 16:03:53 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>,
	Ralf Baechle <ralf@...ux-mips.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Petr Mladek <pmladek@...e.com>,
	David Daney <david.daney@...ium.com>
Subject: linux-next: manual merge of the akpm-current tree with the mips
 tree

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"