linux-kernel - linux-next: manual merge of the signal tree with Linus' 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]

Date:	Mon, 4 Mar 2013 12:58:51 +1100
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
Subject: linux-next: manual merge of the signal tree with Linus' tree

Hi Al,

Today's linux-next merge of the signal tree got a conflict in
arch/tile/Kconfig between commit 887cbce0adea ("arch Kconfig: centralise
CONFIG_ARCH_NO_VIRT_TO_BUS") from Linus' tree and commit 15d9a5d9296a
("make HAVE_SYSCALL_WRAPPERS unconditional") from the signal tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/tile/Kconfig
index 1404497,4069d87..0000000
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@@ -16,8 -16,6 +16,7 @@@ config TIL
  	select GENERIC_PENDING_IRQ if SMP
  	select GENERIC_IRQ_SHOW
  	select HAVE_DEBUG_BUGVERBOSE
- 	select HAVE_SYSCALL_WRAPPERS if TILEGX
 +	select HAVE_VIRT_TO_BUS
  	select SYS_HYPERVISOR
  	select ARCH_HAVE_NMI_SAFE_CMPXCHG
  	select GENERIC_CLOCKEVENTS

Content of type "application/pgp-signature" skipped