linux-kernel - linux-next: manual merge of the signal tree with the tip 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: <20120523160233.b7f40462715f9e092493517b@canb.auug.org.au>
Date:	Wed, 23 May 2012 16:02:33 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Al Viro <viro@...IV.linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Richard Weinberger <richard@....at>,
	"Anna-Maria Gleixner" <anna-maria@...-um.de>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Subject: linux-next: manual merge of the signal tree with the tip tree

Hi Al,

Today's linux-next merge of the signal tree got a conflict in
arch/um/Kconfig.common between commit 875c9d09b5a6 ("um: Use generic time
config") from the tip tree and commit 985a94a96d29 ("um: Remove
CONFIG_IRQ_RELEASE_METHOD") from the signal 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/um/Kconfig.common
index 806185d,43ef890..0000000
--- a/arch/um/Kconfig.common
+++ b/arch/um/Kconfig.common
@@@ -53,11 -52,10 +53,6 @@@ config GENERIC_BU
  	default y
  	depends on BUG
  
- # Used in kernel/irq/manage.c and include/linux/irq.h
- config IRQ_RELEASE_METHOD
- 	bool
- 	default y
- 
 -config GENERIC_CLOCKEVENTS
 -	bool
 -	default y
 -
  config HZ
  	int
  	default 100

Content of type "application/pgp-signature" skipped