linux-kernel - linux-next: manual merge of the akpm-current tree with the audit 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: <20140317202616.b9553da1bbcea707e13cb678@canb.auug.org.au>
Date:	Mon, 17 Mar 2014 20:26:16 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>,
	Eric Paris <eparis@...hat.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	AKASHI Takahiro <takahiro.akashi@...aro.org>,
	Josh Triplett <josh@...htriplett.org>
Subject: linux-next: manual merge of the akpm-current tree with the audit
 tree

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@...b.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

Content of type "application/pgp-signature" skipped