Linus Torvalds 3556485f15 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security ... Pull security subsystem updates for 3.4 from James Morris: "The main addition here is the new Yama security module from Kees Cook, which was discussed at the Linux Security Summit last year. Its purpose is to collect miscellaneous DAC security enhancements in one place. This also marks a departure in policy for LSM modules, which were previously limited to being standalone access control systems. Chromium OS is using Yama, and I believe there are plans for Ubuntu, at least. This patchset also includes maintenance updates for AppArmor, TOMOYO and others." Fix trivial conflict in <net/sock.h> due to the jumo_label->static_key rename. * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (38 commits) AppArmor: Fix location of const qualifier on generated string tables TOMOYO: Return error if fails to delete a domain AppArmor: add const qualifiers to string arrays AppArmor: Add ability to load extended policy TOMOYO: Return appropriate value to poll(). AppArmor: Move path failure information into aa_get_name and rename AppArmor: Update dfa matching routines. AppArmor: Minor cleanup of d_namespace_path to consolidate error handling AppArmor: Retrieve the dentry_path for error reporting when path lookup fails AppArmor: Add const qualifiers to generated string tables AppArmor: Fix oops in policy unpack auditing AppArmor: Fix error returned when a path lookup is disconnected KEYS: testing wrong bit for KEY_FLAG_REVOKED TOMOYO: Fix mount flags checking order. security: fix ima kconfig warning AppArmor: Fix the error case for chroot relative path name lookup AppArmor: fix mapping of META_READ to audit and quiet flags AppArmor: Fix underflow in xindex calculation AppArmor: Fix dropping of allowed operations that are force audited AppArmor: Add mising end of structure test to caps unpacking ...		2012-03-21 13:25:04 -07:00
..
ABI	Power management updates for 3.4	2012-03-21 10:15:51 -07:00
DocBook	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-03-20 21:12:50 -07:00
PCI	…
RCU	rcu: Call out dangers of expedited RCU primitives	2012-02-21 09:06:08 -08:00
accounting	…
acpi	acpi/apei/einj: Add extensions to EINJ from rev 5.0 of acpi spec	2012-01-18 01:14:17 -05:00
aoe	…
arm	Documentation: Fix multiple typo in Documentation	2012-03-07 16:08:24 +01:00
auxdisplay	…
blackfin	…
block	Documentation: drop as block elevator reference in switching-sched.txt	2011-11-04 12:01:48 -07:00
blockdev	cciss: auto engage SCSI mid layer at driver load time	2011-11-16 09:21:49 +01:00
cdrom	…
cgroups	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-03-20 21:12:50 -07:00
connector	…
console	…
cpu-freq	Doc: cpufreq: Fix typo and outdated line	2011-11-08 10:23:29 +01:00
cpuidle	…
cris	…
crypto	…
development-process	Documentation: Update stable address	2011-12-12 14:14:31 -08:00
device-mapper	Documentation: Fix multiple typo in Documentation	2012-03-07 16:08:24 +01:00
devicetree	regulator: Updates for 3.4	2012-03-21 10:34:56 -07:00
driver-model	Merge remote-tracking branches 'regulator/topic/devm' and 'regulator/topic/stub' into regulator-next	2012-03-18 21:38:28 +00:00
dvb	[media] dvb_get_firmware: updates for it913x	2011-12-11 09:00:48 -02:00
early-userspace	…
fault-injection	…
fb	Documentation: Fix multiple typo in Documentation	2012-03-07 16:08:24 +01:00
filesystems	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-03-20 21:12:50 -07:00
firmware_class	…
frv	…
hid	…
hwmon	hwmon changes for v3.4	2012-03-21 10:37:25 -07:00
i2c	USB: ohci-nxp: Rename symbols from pnx4008 to nxp	2012-03-13 14:27:28 -07:00
i2o	Documentation: Fix multiple typo in Documentation	2012-03-07 16:08:24 +01:00
ia64	…
ide	Documentation: Fix multiple typo in Documentation	2012-03-07 16:08:24 +01:00
infiniband	…
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-03-20 21:12:50 -07:00
ioctl	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-03-20 21:12:50 -07:00
isdn	…
ja_JP	…
kbuild	Documentation: Fix multiple typo in Documentation	2012-03-07 16:08:24 +01:00
kdump	[S390] Add s390x description to Documentation/kdump/kdump.txt	2011-12-27 11:27:13 +01:00
ko_KR	driver-core: documentation: fix up Greg's email address	2012-02-15 14:48:01 -08:00
laptops	Documentation: thinkpad-acpi grammo fixes	2011-11-04 12:01:47 -07:00
leds	Documentation: fix leds-class.txt duplicated word	2011-11-04 12:01:48 -07:00
m68k	…
make	…
mips	…
misc-devices	…
mmc	mmc: core: Fixup delayed work clock gating patch	2012-01-11 23:58:43 -05:00
mn10300	…
mtd	…
namespaces	…
netlabel	…
networking	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2012-03-21 13:25:04 -07:00
nfc	…
parisc	…
pcmcia	…
power	PM / Freezer / Docs: Document the beauty of freeze/thaw semantics	2012-02-09 23:55:49 +01:00
powerpc	…
pps	…
prctl	…
pti	…
ptp	…
rapidio	RapidIO: documentation update	2011-11-02 16:07:02 -07:00
s390	[S390] Remove Kerntypes leftovers	2011-12-27 11:27:12 +01:00
scheduler	sched: Remove sched_switch	2012-01-27 13:28:53 +01:00
scsi	Documentation: Fix multiple typo in Documentation	2012-03-07 16:08:24 +01:00
security	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2012-03-21 13:25:04 -07:00
serial	serial/documentation: fix documented name of DCD cpp symbol	2012-01-04 16:26:32 -08:00
sh	…
sound	Documentation: Fix multiple typo in Documentation	2012-03-07 16:08:24 +01:00
sparc	…
spi	spi: create a message queueing infrastructure	2012-03-07 19:19:48 -07:00
sysctl	Documentation: add missing tainted bits to Documentation/sysctl/kernel.txt	2012-02-06 16:29:19 -08:00
target	Documentation: Fix typo in tcm_mod_builder.py	2012-02-10 09:52:18 +01:00
telephony	…
thermal	thermal: Rename generate_netlink_event	2012-01-23 03:15:25 -05:00
timers	…
trace	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-03-20 21:12:50 -07:00
usb	Documentation: Fix Broken URL "freshmeat"	2012-02-21 11:43:45 +01:00
vDSO	…
video4linux	Documentation: Fix multiple typo in Documentation	2012-03-07 16:08:24 +01:00
virtual	Documentation: Fix multiple typo in Documentation	2012-03-07 16:08:24 +01:00
vm	Documentation: Fix multiple typo in Documentation	2012-03-07 16:08:24 +01:00
w1	…
watchdog	Documentation: Fix typo in watchdog-kernel-api.txt	2012-02-21 11:40:34 +01:00
wimax	…
x86	…
zh_CN	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2012-03-20 21:04:47 -07:00
.gitignore	…
00-INDEX	Documentation: Fix broken URL "JF"	2012-02-21 11:44:14 +01:00
BUG-HUNTING	…
Changes	…
CodingStyle	Documentation: update CodingStyle use of braces	2011-11-04 12:01:47 -07:00
DMA-API-HOWTO.txt	…
DMA-API.txt	include/linux/dma-mapping.h: add dma_zalloc_coherent()	2011-11-02 16:07:02 -07:00
DMA-ISA-LPC.txt	…
DMA-attributes.txt	…
HOWTO	Documentation: Update stable address	2011-12-12 14:14:31 -08:00
IPMI.txt	…
IRQ-affinity.txt	…
IRQ-domain.txt	irq_domain: add documentation and MAINTAINERS entry.	2012-02-14 14:06:47 -07:00
IRQ.txt	…
Intel-IOMMU.txt	…
Makefile	…
ManagementStyle	…
SAK.txt	…
SM501.txt	…
SecurityBugs	…
SubmitChecklist	…
SubmittingDrivers	…
SubmittingPatches	…
VGA-softcursor.txt	…
applying-patches.txt	…
atomic_ops.txt	doc: Add load/store guarantees to Documentation/atomic-ops.txt	2011-12-11 10:31:58 -08:00
bad_memory.txt	…
basic_profiling.txt	…
binfmt_misc.txt	…
braille-console.txt	…
bt8xxgpio.txt	…
btmrvl.txt	…
bus-virt-phys-mapping.txt	…
cachetlb.txt	…
circular-buffers.txt	…
coccinelle.txt	coccinelle.txt: update documentation to include M= option	2012-01-14 22:25:56 +01:00
cpu-hotplug.txt	…
cpu-load.txt	…
cputopology.txt	…
dcdbas.txt	…
debugging-modules.txt	…
debugging-via-ohci1394.txt	…
dell_rbu.txt	…
devices.txt	vhost-net: add module alias (v2.1)	2012-01-13 10:12:23 -08:00
digsig.txt	crypto: digital signature verification support	2011-11-09 12:10:37 +02:00
dma-buf-sharing.txt	dma-buf: Documentation update for Kconfig select	2012-01-13 10:27:33 +00:00
dmaengine.txt	Documentation: Fix multiple typo in Documentation	2012-03-07 16:08:24 +01:00
dontdiff	[S390] Remove Kerntypes leftovers	2011-12-27 11:27:12 +01:00
dynamic-debug-howto.txt	dynamic_debug: process multiple debug-queries on a line	2012-01-24 12:50:36 -08:00
edac.txt	…
eisa.txt	…
email-clients.txt	…
feature-removal-schedule.txt	Merge branch 'kmap_atomic' of git://github.com/congwang/linux	2012-03-21 09:40:26 -07:00
flexible-arrays.txt	…
futex-requeue-pi.txt	…
gcov.txt	…
gpio.txt	…
highuid.txt	…
hw_random.txt	…
hwspinlock.txt	…
init.txt	…
initrd.txt	…
intel_txt.txt	…
io-mapping.txt	…
io_ordering.txt	…
iostats.txt	…
irqflags-tracing.txt	…
isapnp.txt	…
java.txt	…
kernel-doc-nano-HOWTO.txt	…
kernel-docs.txt	…
kernel-parameters.txt	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-03-20 21:12:50 -07:00
kmemcheck.txt	…
kmemleak.txt	kmemleak: Handle percpu memory allocation	2011-12-02 16:12:42 +00:00
kobject.txt	driver-core: documentation: fix up Greg's email address	2012-02-15 14:48:01 -08:00
kprobes.txt	…
kref.txt	…
ldm.txt	…
local_ops.txt	…
lockdep-design.txt	lockdep: Update documentation for lock-class leak detection	2011-12-11 10:31:23 -08:00
lockstat.txt	…
lockup-watchdogs.txt	watchdog: Update documentation	2012-02-11 15:11:28 +01:00
logo.gif	…
logo.txt	…
magic-number.txt	drivers/net: fix up stale paths from driver reorg	2012-01-30 12:54:40 -05:00
mca.txt	…
md.txt	md: create externally visible flags for supporting hot-replace.	2011-12-23 10:17:51 +11:00
media-framework.txt	…
memory-barriers.txt	…
memory-hotplug.txt	…
memory.txt	…
mono.txt	…
mutex-design.txt	…
nommu-mmap.txt	…
numastat.txt	Doc: Update numastat.txt	2012-02-28 16:05:06 +01:00
oops-tracing.txt	module,bug: Add TAINT_OOT_MODULE flag for modules not built in-tree	2011-11-07 07:54:42 +10:30
padata.txt	…
parport-lowlevel.txt	…
parport.txt	…
pi-futex.txt	…
pinctrl.txt	pinctrl: fix some pinmux typos	2012-01-26 14:11:31 +01:00
pnp.txt	…
preempt-locking.txt	…
printk-formats.txt	…
prio_tree.txt	…
ramoops.txt	…
rbtree.txt	…
rfkill.txt	…
robust-futex-ABI.txt	…
robust-futexes.txt	…
rt-mutex-design.txt	…
rt-mutex.txt	…
rtc.txt	…
serial-console.txt	…
sgi-ioc4.txt	…
sgi-visws.txt	…
sparse.txt	…
spinlocks.txt	…
stable_api_nonsense.txt	…
stable_kernel_rules.txt	stable: update documentation to ask for kernel version	2012-01-24 10:50:22 -08:00
static-keys.txt	static keys: Add docs better explaining the whole 'struct static_key' mechanism	2012-02-24 09:12:19 +01:00
svga.txt	…
sysfs-rules.txt	…
sysrq.txt	…
unaligned-memory-access.txt	…
unicode.txt	…
unshare.txt	…
vgaarbiter.txt	misc latin1 to utf8 conversions	2012-01-02 13:04:55 +01:00
video-output.txt	…
volatile-considered-harmful.txt	…
workqueue.txt	…
xz.txt	…
zorro.txt	…