projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4e5d6f7
7ebd467
)
Merge branch 'master' into next
author
James Morris
<jmorris@namei.org>
Thu, 6 May 2010 00:56:07 +0000
(10:56 +1000)
committer
James Morris
<jmorris@namei.org>
Thu, 6 May 2010 00:56:07 +0000
(10:56 +1000)
25 files changed:
1
2
Documentation/kernel-parameters.txt
patch
|
diff1
|
diff2
|
blob
|
history
drivers/char/tpm/tpm.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/char/tpm/tpm_tis.c
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/security.h
patch
|
diff1
|
diff2
|
blob
|
history
kernel/cred.c
patch
|
diff1
|
diff2
|
blob
|
history
kernel/sys.c
patch
|
diff1
|
diff2
|
blob
|
history
security/device_cgroup.c
patch
|
diff1
|
diff2
|
blob
|
history
security/integrity/ima/ima_audit.c
patch
|
diff1
|
diff2
|
blob
|
history
security/integrity/ima/ima_crypto.c
patch
|
diff1
|
diff2
|
blob
|
history
security/integrity/ima/ima_fs.c
patch
|
diff1
|
diff2
|
blob
|
history
security/integrity/ima/ima_iint.c
patch
|
diff1
|
diff2
|
blob
|
history
security/integrity/ima/ima_init.c
patch
|
diff1
|
diff2
|
blob
|
history
security/integrity/ima/ima_main.c
patch
|
diff1
|
diff2
|
blob
|
history
security/integrity/ima/ima_policy.c
patch
|
diff1
|
diff2
|
blob
|
history
security/integrity/ima/ima_queue.c
patch
|
diff1
|
diff2
|
blob
|
history
security/keys/keyring.c
patch
|
diff1
|
diff2
|
blob
|
history
security/keys/proc.c
patch
|
diff1
|
diff2
|
blob
|
history
security/lsm_audit.c
patch
|
diff1
|
diff2
|
blob
|
history
security/selinux/netlabel.c
patch
|
diff1
|
diff2
|
blob
|
history
security/selinux/netlink.c
patch
|
diff1
|
diff2
|
blob
|
history
security/smack/smack_lsm.c
patch
|
diff1
|
diff2
|
blob
|
history
security/tomoyo/common.c
patch
|
diff1
|
diff2
|
blob
|
history
security/tomoyo/domain.c
patch
|
diff1
|
diff2
|
blob
|
history
security/tomoyo/file.c
patch
|
diff1
|
diff2
|
blob
|
history
security/tomoyo/realpath.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Documentation/kernel-parameters.txt
Simple merge
diff --cc
drivers/char/tpm/tpm.c
Simple merge
diff --cc
drivers/char/tpm/tpm_tis.c
Simple merge
diff --cc
include/linux/security.h
Simple merge
diff --cc
kernel/cred.c
Simple merge
diff --cc
kernel/sys.c
Simple merge
diff --cc
security/device_cgroup.c
Simple merge
diff --cc
security/integrity/ima/ima_audit.c
Simple merge
diff --cc
security/integrity/ima/ima_crypto.c
Simple merge
diff --cc
security/integrity/ima/ima_fs.c
Simple merge
diff --cc
security/integrity/ima/ima_iint.c
Simple merge
diff --cc
security/integrity/ima/ima_init.c
Simple merge
diff --cc
security/integrity/ima/ima_main.c
Simple merge
diff --cc
security/integrity/ima/ima_policy.c
Simple merge
diff --cc
security/integrity/ima/ima_queue.c
Simple merge
diff --cc
security/keys/keyring.c
Simple merge
diff --cc
security/keys/proc.c
Simple merge
diff --cc
security/lsm_audit.c
Simple merge
diff --cc
security/selinux/netlabel.c
Simple merge
diff --cc
security/selinux/netlink.c
index
7d7be29
,
0e147b6
..
36ac257
---
1
/
security/selinux/netlink.c
---
2
/
security/selinux/netlink.c
+++ b/
security/selinux/netlink.c
@@@
-11,8
-11,10
+11,9
@@@
*/
#include <linux/init.h>
#include <linux/types.h>
+ #include <linux/slab.h>
#include <linux/stddef.h>
#include <linux/kernel.h>
-#include <linux/list.h>
#include <linux/skbuff.h>
#include <linux/netlink.h>
#include <linux/selinux_netlink.h>
diff --cc
security/smack/smack_lsm.c
Simple merge
diff --cc
security/tomoyo/common.c
Simple merge
diff --cc
security/tomoyo/domain.c
Simple merge
diff --cc
security/tomoyo/file.c
Simple merge
diff --cc
security/tomoyo/realpath.c
Simple merge