linux-kernel - linux-next: manual merge of the irqdomain 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>] [day] [month] [year] [list]

Message-Id: <20120319172254.78e16fcb56fef216cc8fafac@canb.auug.org.au>
Date:	Mon, 19 Mar 2012 17:22:54 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Grant Likely <grant.likely@...retlab.ca>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Mircea Gherzan <mgherzan@...il.com>,
	Russell King <rmk@....linux.org.uk>,
	Rob Herring <rob.herring@...xeda.com>
Subject: linux-next: manual merge of the irqdomain tree with the arm tree

Hi Grant,

Today's linux-next merge of the irqdomain tree got a conflict in
arch/arm/Kconfig between commit 4755ccad6d53 ("ARM: 7259/3: net: JIT
compiler for packet filters") from the arm tree and commit 2378b56c3747
("ARM: kconfig: always select IRQ_DOMAIN") from the irqdomain tree.

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

diff --cc arch/arm/Kconfig
index 3795400,c857283..0000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -33,7 -31,8 +33,8 @@@ config AR
  	select GENERIC_IRQ_SHOW
  	select CPU_PM if (SUSPEND || CPU_IDLE)
  	select GENERIC_PCI_IOMAP
 +	select HAVE_BPF_JIT
+ 	select IRQ_DOMAIN
  	help
  	  The ARM series is a line of low-power-consumption RISC chip designs
  	  licensed by ARM Ltd and targeted at embedded applications and

Content of type "application/pgp-signature" skipped