linux-next: manual merge of the tip tree with the security tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]


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@xxxxxxxxxxxxxxxx

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>

Attachment: pgpkk4c6jliFt.pgp
Description: PGP signature


[Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Photo]     [Yosemite News]    [Yosemite Photos]    [Free Online Dating]     [Linux Kernel]     [Linux SCSI]     [XFree86]

Add to Google Powered by Linux