Linus Torvalds c49c41a413 Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security ... * 'for-linus' of git://selinuxproject.org/~jmorris/linux-security: capabilities: remove __cap_full_set definition security: remove the security_netlink_recv hook as it is equivalent to capable() ptrace: do not audit capability check when outputing /proc/pid/stat capabilities: remove task_ns_* functions capabitlies: ns_capable can use the cap helpers rather than lsm call capabilities: style only - move capable below ns_capable capabilites: introduce new has_ns_capabilities_noaudit capabilities: call has_ns_capability from has_capability capabilities: remove all _real_ interfaces capabilities: introduce security_capable_noaudit capabilities: reverse arguments to security_capable capabilities: remove the task from capable LSM hook entirely selinux: sparse fix: fix several warnings in the security server cod selinux: sparse fix: fix warnings in netlink code selinux: sparse fix: eliminate warnings for selinuxfs selinux: sparse fix: declare selinux_disable() in security.h selinux: sparse fix: move selinux_complete_init selinux: sparse fix: make selinux_secmark_refcount static SELinux: Fix RCU deref check warning in sel_netport_insert() Manually fix up a semantic mis-merge wrt security_netlink_recv(): - the interface was removed in commit fd77846152 ("security: remove the security_netlink_recv hook as it is equivalent to capable()") - a new user of it appeared in commit a38f7907b9 ("crypto: Add userspace configuration API") causing no automatic merge conflict, but Eric Paris pointed out the issue.		2012-01-14 18:36:33 -08:00
..
array.c	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	2012-01-14 18:36:33 -08:00
base.c	proc: fix null pointer deref in proc_pid_permission()	2012-01-12 20:13:02 -08:00
cmdline.c
consoles.c	console: rename acquire/release_console_sem() to console_lock/unlock()	2011-01-26 10:50:06 +10:00
cpuinfo.c
devices.c	proc: use seq_puts()/seq_putc() where possible	2011-01-13 08:03:16 -08:00
generic.c	switch procfs to umode_t use	2012-01-03 22:54:56 -05:00
inode.c	procfs: add hidepid= and gid= mount options	2012-01-10 16:30:54 -08:00
internal.h	procfs: parse mount options	2012-01-10 16:30:54 -08:00
interrupts.c
Kconfig	kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT	2011-01-20 17:02:05 -08:00
kcore.c	/proc/kcore: fix seeking	2011-01-13 08:03:17 -08:00
kmsg.c	procfs: Use generic_file_llseek in /proc/kmsg	2010-04-09 16:35:41 +02:00
loadavg.c
Makefile	ns: proc files for namespace naming policy.	2011-05-10 14:31:44 -07:00
meminfo.c	fs/proc/meminfo.c: fix compilation error	2011-12-09 07:50:28 -08:00
mmu.c
namespaces.c	vfs: trim includes a bit	2012-01-03 22:57:13 -05:00
nommu.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
page.c	thp: remove PG_buddy	2011-01-13 17:32:43 -08:00
proc_devtree.c	of/flattree: Drop an uninteresting message to pr_debug level	2011-03-02 13:45:18 -07:00
proc_net.c	switch procfs to umode_t use	2012-01-03 22:54:56 -05:00
proc_sysctl.c	Merge branch 'akpm' (Andrew's incoming - part two)	2011-11-02 16:07:27 -07:00
proc_tty.c	proc: use seq_puts()/seq_putc() where possible	2011-01-13 08:03:16 -08:00
root.c	procfs: add hidepid= and gid= mount options	2012-01-10 16:30:54 -08:00
softirqs.c	proc: use seq_puts()/seq_putc() where possible	2011-01-13 08:03:16 -08:00
stat.c	Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-01-06 08:44:54 -08:00
task_mmu.c	mm: distinguish between mlocked and pinned pages	2011-10-31 17:30:46 -07:00
task_nommu.c	report errors in /proc/*/*map* sanely	2011-03-23 16:36:50 -04:00
uptime.c	Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into cputime-tip	2011-12-19 19:23:15 +01:00
version.c
vmcore.c	fs: add export.h to files using EXPORT_SYMBOL/THIS_MODULE macros	2011-10-31 19:30:31 -04:00