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 [email protected] 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
pgp94ZzXJxCEG.pgp
Description: PGP signature
