Linus Torvalds cb60e3e65c Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security ... Pull security subsystem updates from James Morris: "New notable features: - The seccomp work from Will Drewry - PR_{GET,SET}_NO_NEW_PRIVS from Andy Lutomirski - Longer security labels for Smack from Casey Schaufler - Additional ptrace restriction modes for Yama by Kees Cook" Fix up trivial context conflicts in arch/x86/Kconfig and include/linux/filter.h * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (65 commits) apparmor: fix long path failure due to disconnected path apparmor: fix profile lookup for unconfined ima: fix filename hint to reflect script interpreter name KEYS: Don't check for NULL key pointer in key_validate() Smack: allow for significantly longer Smack labels v4 gfp flags for security_inode_alloc()? Smack: recursive tramsmute Yama: replace capable() with ns_capable() TOMOYO: Accept manager programs which do not start with / . KEYS: Add invalidation support KEYS: Do LRU discard in full keyrings KEYS: Permit in-place link replacement in keyring list KEYS: Perform RCU synchronisation on keys prior to key destruction KEYS: Announce key type (un)registration KEYS: Reorganise keys Makefile KEYS: Move the key config into security/keys/Kconfig KEYS: Use the compat keyctl() syscall wrapper on Sparc64 for Sparc32 compat Yama: remove an unused variable samples/seccomp: fix dependencies on arch macros Yama: add additional ptrace scopes ...		2012-05-21 20:27:36 -07:00
..
9p	9p changes for the 3.4 merge window	2012-03-28 09:58:38 -07:00
adfs
affs
afs
autofs4	autofs: make the autofsv5 packet file descriptor use a packetized pipe	2012-04-29 13:30:08 -07:00
befs
bfs
btrfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2012-05-06 10:20:07 -07:00
cachefiles
ceph	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client	2012-03-28 10:01:29 -07:00
cifs	cifs: fix misspelling of "forcedirectio"	2012-05-16 11:26:25 -05:00
coda	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
configfs
cramfs
debugfs	simple_open: automatically convert to simple_open()	2012-04-05 15:25:50 -07:00
devpts
dlm	dlm fixes for 3.4	2012-04-23 18:22:42 -07:00
ecryptfs
efs
exofs	Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd	2012-03-28 20:04:27 -07:00
exportfs
ext2	vfs: make it possible to access the dentry hash/len as one 64-bit entry	2012-05-10 19:54:35 -07:00
ext3	vfs: make it possible to access the dentry hash/len as one 64-bit entry	2012-05-10 19:54:35 -07:00
ext4	vfs: make it possible to access the dentry hash/len as one 64-bit entry	2012-05-10 19:54:35 -07:00
fat
freevxfs
fscache
fuse	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse	2012-04-18 17:29:05 -07:00
gfs2	Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw	2012-05-21 19:21:20 -07:00
hfs
hfsplus	hfsplus: Fix potential buffer overflows	2012-05-04 17:11:24 -07:00
hostfs	Merge branch 'for-linus-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml	2012-03-27 18:29:53 -07:00
hpfs
hppfs
hugetlbfs	hugetlbfs: lockdep annotate root inode properly	2012-04-25 21:26:34 -07:00
isofs
jbd
jbd2	jbd2: use GFP_NOFS for blkdev_issue_flush	2012-04-23 21:43:41 -04:00
jffs2	jffs2: Fix lock acquisition order bug in gc path	2012-05-07 20:30:14 +01:00
jfs
lockd	lockd: fix the endianness bug	2012-04-13 13:50:52 -04:00
logfs
minix
ncpfs	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
nfs	vfs: make it possible to access the dentry hash/len as one 64-bit entry	2012-05-10 19:54:35 -07:00
nfs_common
nfsd	nfsd: fix nfs4recover.c printk format warning	2012-04-30 12:28:48 -07:00
nilfs2	vfs: make it possible to access the dentry hash/len as one 64-bit entry	2012-05-10 19:54:35 -07:00
nls
notify
ntfs
ocfs2	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-04-23 23:15:17 -04:00
omfs
openpromfs
proc	Merge branch 'akpm' (Andrew's patch-bomb)	2012-05-18 15:56:25 -07:00
pstore	Merge branch 'akpm' (Andrew's patch-bomb)	2012-04-05 15:30:34 -07:00
qnx4
qnx6
quota	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs	2012-03-28 10:00:14 -07:00
ramfs
reiserfs	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
romfs	MTD merge for 3.4	2012-03-30 17:31:56 -07:00
squashfs	Add an extra mount time sanity check, plus some code cleanups and bug fixes.	2012-03-28 18:05:54 -07:00
sysfs	sysfs: handle 'parent deleted before child added'	2012-04-10 14:48:51 -07:00
sysv
ubifs	vfs: make it possible to access the dentry hash/len as one 64-bit entry	2012-05-10 19:54:35 -07:00
udf	vfs: make it possible to access the dentry hash/len as one 64-bit entry	2012-05-10 19:54:35 -07:00
ufs	vfs: make it possible to access the dentry hash/len as one 64-bit entry	2012-05-10 19:54:35 -07:00
xfs	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
aio.c	vfs: make AIO use the proper rw_verify_area() area helpers	2012-05-21 16:06:20 -07:00
anon_inodes.c
attr.c
bad_inode.c
binfmt_aout.c	VM: add "vm_mmap()" helper function	2012-04-20 17:29:13 -07:00
binfmt_elf_fdpic.c	VM: add "vm_mmap()" helper function	2012-04-20 17:29:13 -07:00
binfmt_elf.c	VM: add "vm_mmap()" helper function	2012-04-20 17:29:13 -07:00
binfmt_em86.c
binfmt_flat.c	VM: add "vm_mmap()" helper function	2012-04-20 17:29:13 -07:00
binfmt_misc.c
binfmt_script.c
binfmt_som.c	VM: add "vm_mmap()" helper function	2012-04-20 17:29:13 -07:00
bio-integrity.c
bio.c	bio allocation failure due to bio_get_nr_vecs()	2012-05-11 16:45:12 +02:00
block_dev.c	block: don't mark buffers beyond end of disk as mapped	2012-05-11 16:42:14 +02:00
buffer.c	block: don't mark buffers beyond end of disk as mapped	2012-05-11 16:42:14 +02:00
char_dev.c
compat_binfmt_elf.c
compat_ioctl.c	The following text was taken from the original review request:	2012-03-24 10:24:31 -07:00
compat.c	Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-29 18:12:23 -07:00
dcache.c	Revert "vfs: remove unnecessary d_unhashed() check from __d_lookup_rcu"	2012-05-21 18:48:10 -07:00
dcookies.c
direct-io.c
drop_caches.c
eventfd.c
eventpoll.c	epoll: clear the tfile_check_list on -ELOOP	2012-04-25 21:26:33 -07:00
exec.c	Add PR_{GET,SET}_NO_NEW_PRIVS to prevent execve from granting privs	2012-04-14 11:13:18 +10:00
fcntl.c
fhandle.c
fifo.c
file_table.c
file.c	Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-29 18:12:23 -07:00
filesystems.c
fs_struct.c	The following text was taken from the original review request:	2012-03-24 10:24:31 -07:00
fs-writeback.c	trivial writeback fixes	2012-03-28 10:07:27 -07:00
generic_acl.c
inode.c
internal.h
ioctl.c
ioprio.c
Kconfig
Kconfig.binfmt	C6X: add support to build with BINFMT_ELF_FDPIC	2012-05-15 09:17:34 -04:00
libfs.c	vfs: make it possible to access the dentry hash/len as one 64-bit entry	2012-05-10 19:54:35 -07:00
locks.c	CIFS: Fix VFS lock usage for oplocked files	2012-04-01 13:54:27 -05:00
Makefile
mbcache.c
mount.h
mpage.c
namei.c	Merge branch 'dentry-cleanups' (dcache access cleanups and optimizations)	2012-05-21 08:50:57 -07:00
namespace.c
no-block.c
open.c	SELinux: rename dentry_open to file_open	2012-04-09 12:22:50 -04:00
pipe.c	pipes: add a "packetized pipe" mode for writing	2012-04-29 13:12:42 -07:00
pnode.c
pnode.h
posix_acl.c
proc_namespace.c
read_write.c
read_write.h
readdir.c
select.c	Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-29 18:12:23 -07:00
seq_file.c	The following text was taken from the original review request:	2012-03-24 10:24:31 -07:00
signalfd.c
splice.c	tcp: tcp_sendpages() should call tcp_push() once	2012-04-05 19:04:27 -04:00
stack.c
stat.c	Merge branch 'vfs-cleanups' (random vfs cleanups)	2012-05-21 08:46:08 -07:00
statfs.c
super.c	The following text was taken from the original review request:	2012-03-24 10:24:31 -07:00
sync.c
timerfd.c
utimes.c
xattr_acl.c
xattr.c	fs/xattr.c:setxattr(): improve handling of allocation failures	2012-04-05 15:25:50 -07:00