linux-kernel - linux-next: manual merge of the akpm tree with the security 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: <20120215152818.58f32cb975a52a28328799a1@canb.auug.org.au>
Date:	Wed, 15 Feb 2012 15:28:18 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Akinobu Mita <akinobu.mita@...il.com>,
	Al Viro <viro@....linux.org.uk>,
	James Morris <jmorris@...ei.org>
Subject: linux-next: manual merge of the akpm tree with the security tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
kernel/sysctl.c between commit 404015308747 ("security: trim security.h")
from the security tree and commit "sysctl: use bitmap library functions"
from the akpm.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc kernel/sysctl.c
index 62538ee,cfeb1fa..0000000
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@@ -58,7 -58,7 +58,8 @@@
  #include <linux/oom.h>
  #include <linux/kmod.h>
  #include <linux/capability.h>
 +#include <linux/binfmts.h>
+ #include <linux/bitmap.h>
  
  #include <asm/uaccess.h>
  #include <asm/processor.h>

Content of type "application/pgp-signature" skipped