linux-kernel - linux-next: manual merge of the powerpc tree with the arm 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 for Android: free password hash cracker in your pocket

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

Message-Id: <20120308120422.e071cba36425eacbee1f8d98@canb.auug.org.au>
Date:	Thu, 8 Mar 2012 12:04:22 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Benjamin Herrenschmidt <benh@...nel.crashing.org>,
	Paul Mackerras <paulus@...ba.org>,
	<linuxppc-dev@...ts.ozlabs.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Rob Herring <rob.herring@...xeda.com>,
	Russell King <rmk@....linux.org.uk>,
	Grant Likely <grant.likely@...retlab.ca>
Subject: linux-next: manual merge of the powerpc tree with the arm tree

Hi all,

Today's linux-next merge of the powerpc tree got a conflict in
arch/powerpc/Kconfig between commit 2ed86b16eabe ("irq: make SPARSE_IRQ
an optionally hidden option") from the arm tree and commit ad5b7f1350c2
("powerpc: Make SPARSE_IRQ required") from the powerpc tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/powerpc/Kconfig
index bf7dbc2,4eecaaa..0000000
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -133,7 -133,8 +133,8 @@@ config PP
  	select HAVE_REGS_AND_STACK_ACCESS_API
  	select HAVE_HW_BREAKPOINT if PERF_EVENTS && PPC_BOOK3S_64
  	select HAVE_GENERIC_HARDIRQS
 -	select HAVE_SPARSE_IRQ
 +	select MAY_HAVE_SPARSE_IRQ
+ 	select SPARSE_IRQ
  	select IRQ_PER_CPU
  	select GENERIC_IRQ_SHOW
  	select GENERIC_IRQ_SHOW_LEVEL

Content of type "application/pgp-signature" skipped