You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David S. Miller 72c2dfdefa Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec ... Steffen Klassert says: ==================== 1) Fix a sleep in atomic when pfkey_sadb2xfrm_user_sec_ctx() is called from pfkey_compile_policy(). Fix from Nikolay Aleksandrov. 2) security_xfrm_policy_alloc() can be called in process and atomic context. Add an argument to let the callers choose the appropriate way. Fix from Nikolay Aleksandrov. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		11 years ago
..
apparmor	Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	11 years ago
integrity	Merge to v3.13-rc7 for prerequisite changes in the Xen code for TPM	11 years ago
keys	KEYS: Make the keyring cycle detector ignore other keyrings of the same name	11 years ago
selinux	selinux: add gfp argument to security_xfrm_policy_alloc and fix callers	11 years ago
smack	Merge git://git.infradead.org/users/eparis/audit	11 years ago
tomoyo	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	12 years ago
yama	yama: Better permission check for ptraceme	12 years ago
Kconfig	security: select correct default LSM_MMAP_MIN_ADDR on arm on arm64	11 years ago
Makefile	security: remove erroneous comment about capabilities.o link ordering	12 years ago
capability.c	selinux: add gfp argument to security_xfrm_policy_alloc and fix callers	11 years ago
commoncap.c	capabilities: allow nice if we are privileged	12 years ago
device_cgroup.c	cgroup: replace cftype->read_seq_string() with cftype->seq_show()	11 years ago
inode.c	securityfs: fix object creation races	13 years ago
lsm_audit.c	Merge git://git.infradead.org/users/eparis/audit	11 years ago
min_addr.c	mmap_min_addr check CAP_SYS_RAWIO only for write	15 years ago
security.c	selinux: add gfp argument to security_xfrm_policy_alloc and fix callers	11 years ago