linux-kernel - linux-next: manual merge of the tip 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: <20120224140616.1b59431e58fe8a719b415eef@canb.auug.org.au>
Date:	Fri, 24 Feb 2012 14:06:16 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Al Viro <viro@....linux.org.uk>,
	James Morris <jmorris@...ei.org>,
	"David S. Miller" <davem@...emloft.net>
Subject: linux-next: manual merge of the tip tree with the security tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in
include/net/sock.h between commit 404015308747 ("security: trim
security.h") from the security tree and commit 77a73e5383a9 ("static
keys: Introduce 'struct static_key', very_[un]likely(), static_key_slow_
[inc|dec]()") from the tip tree.

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 include/net/sock.h
index 7b195a8,907bbe0..0000000
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@@ -55,9 -55,7 +55,9 @@@
  #include <linux/uaccess.h>
  #include <linux/memcontrol.h>
  #include <linux/res_counter.h>
- #include <linux/jump_label.h>
+ #include <linux/static_key.h>
 +#include <linux/aio.h>
 +#include <linux/sched.h>
  
  #include <linux/filter.h>
  #include <linux/rculist_nulls.h>

Content of type "application/pgp-signature" skipped