Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
arch/ia64/Kconfig between commit b4df597ae51f ("audit: Add
CONFIG_HAVE_ARCH_AUDITSYSCALL") from the audit tree and commit
a13978c6e0ba ("ia64: select CONFIG_TTY for use of tty_write_message in
unaligned") from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc arch/ia64/Kconfig
index 5409bf46cb83,6b83c66f51b1..000000000000
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@@ -44,7 -44,7 +44,8 @@@ config IA6
select HAVE_MOD_ARCH_SPECIFIC
select MODULES_USE_ELF_RELA
select ARCH_USE_CMPXCHG_LOCKREF
+ select HAVE_ARCH_AUDITSYSCALL
+ select TTY
default y
help
The Itanium Processor Family is Intel's 64-bit successor to
Attachment:
pgpIr3pLy_VQx.pgp
Description: PGP signature
