* linux-next: manual merge of the akpm-current tree with the audit tree
@ 2014-03-17 9:26 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2014-03-17 9:26 UTC (permalink / raw)
To: Andrew Morton, Eric Paris
Cc: linux-next, linux-kernel, AKASHI Takahiro, Josh Triplett
[-- Attachment #1: Type: text/plain, Size: 890 bytes --]
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@canb.auug.org.au
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 #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-03-17 9:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-03-17 9:26 linux-next: manual merge of the akpm-current tree with the audit tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).