Linus Torvalds f39d420f67 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security ... Pull security subsystem updates from James Morris: "In this update, Smack learns to love IPv6 and to mount a filesystem with a transmutable hierarchy (i.e. security labels are inherited from parent directory upon creation rather than creating process). The rest of the changes are maintenance" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (37 commits) tpm/tpm_i2c_infineon: Remove unused header file tpm: tpm_i2c_infinion: Don't modify i2c_client->driver evm: audit integrity metadata failures integrity: move integrity_audit_msg() evm: calculate HMAC after initializing posix acl on tmpfs maintainers: add Dmitry Kasatkin Smack: Fix the bug smackcipso can't set CIPSO correctly Smack: Fix possible NULL pointer dereference at smk_netlbl_mls() Smack: Add smkfstransmute mount option Smack: Improve access check performance Smack: Local IPv6 port based controls tpm: fix regression caused by section type conflict of tpm_dev_release() in ppc builds maintainers: Remove Kent from maintainers tpm: move TPM_DIGEST_SIZE defintion tpm_tis: missing platform_driver_unregister() on error in init_tis() security: clarify cap_inode_getsecctx description apparmor: no need to delay vfree() apparmor: fix fully qualified name parsing apparmor: fix setprocattr arg processing for onexec apparmor: localize getting the security context to a few macros ...		2013-07-03 14:04:58 -07:00
..
ABI	Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-07-02 16:15:23 -07:00
accounting	doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c	2012-11-26 14:22:21 +01:00
acpi	ACPI/APEI: Update einj documentation for param1/param2	2013-06-06 15:28:11 -07:00
aoe	aoe: allow user to disable target failure timeout	2012-12-17 17:15:25 -08:00
arm	ARM SoC late changes	2013-07-02 14:42:51 -07:00
arm64	arm64: KVM: document kernel object mappings in HYP	2013-06-12 16:42:20 +01:00
auxdisplay
backlight	backlight: lp855x: remove duplicate platform data	2013-04-29 18:28:19 -07:00
blackfin	Documentation: Fix typo in multiple files in Documentation	2012-04-16 14:37:13 +02:00
block	Documentation: cfq-iosched: update documentation help for cfq tunables	2013-04-09 14:57:06 +02:00
blockdev	nbd: update documentation and link to mailinglist	2013-02-27 19:10:22 -08:00
bus-devices	ARM: OMAP2+: gpmc: generic timing calculation	2012-11-09 18:07:11 +05:30
cdrom	doc: fix broken references	2011-09-27 18:08:04 +02:00
cgroups	sched: Rename sched.c as sched/core.c in comments and Documentation	2013-06-19 12:58:42 +02:00
connector	connector: Move cn_test.c away from NLMSG_PUT().	2012-06-26 21:19:02 -07:00
console	TTY:console: update document console.txt	2013-05-21 10:21:57 -07:00
cpu-freq	Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-05-05 13:23:27 -07:00
cpuidle	cpuidle: make a single register function for all	2013-04-23 13:45:22 +02:00
cris	CRIS: Update documentation	2012-04-03 13:09:18 +02:00
crypto	KEYS: Document asymmetric key type	2012-10-08 13:50:12 +10:30
development-process	Documentation: Update stable address	2011-12-12 14:14:31 -08:00
device-mapper	DM RAID: Add message/status support for changing sync action	2013-04-24 11:42:43 +10:00
devicetree	regulator: Updates for v3.11	2013-07-03 11:56:38 -07:00
DocBook	Merge branch 'exotic-arch-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	2013-07-03 11:12:08 -07:00
driver-model	lib: devres: Introduce devm_ioremap_resource()	2013-01-22 09:41:43 -08:00
dvb	[media] get_dvb_firmware: Fix the location of firmware for Terratec HTC	2013-01-01 11:18:26 -02:00
early-userspace
EDID	drm: Add 1600x1200 (UXGA) screen resolution to the built-in EDIDs	2013-04-12 14:06:16 +10:00
extcon	Documentation/extcon: porting guide for Android kernel switch driver.	2012-04-20 09:24:27 -07:00
fault-injection	doc: fix quite a few typos within Documentation	2012-11-19 14:28:24 +01:00
fb	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
filesystems	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-07-03 09:10:19 -07:00
firmware_class	firmware loader: document firmware cache mechanism	2012-11-14 15:07:18 -08:00
fmc	FMC: add a char-device mezzanine driver	2013-06-18 15:42:15 -07:00
frv	doc: fix broken references	2011-09-27 18:08:04 +02:00
hid	HID: remove x bit from sensor doc	2012-12-14 08:48:59 +01:00
hwmon	Finally eradicate CONFIG_HOTPLUG	2013-06-03 14:20:18 -07:00
i2c	i2c: Fix my e-mail address in drivers and documentation	2013-03-22 11:18:34 +01:00
i2o	Documentation: Fix multiple typo in Documentation	2012-03-07 16:08:24 +01:00
ia64	Fix example error_injection_tool	2013-04-02 09:39:55 -07:00
ide	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
infiniband	IB/ipoib: Add rtnl_link_ops support	2012-09-20 16:49:17 -04:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2013-03-11 07:49:37 -07:00
ioctl	s390/sclp: Add SCLP character device driver	2013-06-26 21:10:13 +02:00
isdn	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
ja_JP
kbuild	Finally eradicate CONFIG_HOTPLUG	2013-06-03 14:20:18 -07:00
kdump	Add size restriction to the kdump documentation	2013-04-02 09:40:03 -07:00
ko_KR	driver-core: documentation: fix up Greg's email address	2012-02-15 14:48:01 -08:00
laptops	Documentation/laptops: remove depends on CONFIG_EXPERIMENTAL	2013-01-21 14:52:42 -08:00
leds	leds: lp55xx: configure the clock detection	2013-04-01 11:04:53 -07:00
m68k	block: remove refs to XD disks from documentation	2013-05-17 15:17:12 +02:00
make
memory-devices	memory: emif: add basic infrastructure for EMIF driver	2012-05-02 00:10:49 -07:00
metag	metag: Basic documentation	2013-03-02 20:09:50 +00:00
mips
misc-devices	mei: bus: Add device enabling and disabling API	2013-04-08 16:57:15 -07:00
mmc	mmc: core: Add in support to expose PRV for v4 MMCs	2013-03-22 12:10:42 -04:00
mn10300
mtd
namespaces	userns: Recommend use of memory control groups.	2013-01-26 22:20:06 -08:00
netlabel
networking	tcp: doc : fix the syncookies default value	2013-06-24 00:26:26 -07:00
nfc	NFC: Update pn544 documentation	2013-01-10 01:27:46 +01:00
parisc	Documentation: Fix typo in multiple files in Documentation	2012-04-16 14:37:13 +02:00
PCI	PCI/MSI: Enable multiple MSIs with pci_enable_msi_block_auto()	2013-01-24 17:25:13 +01:00
pcmcia
power	PM / hibernate: Correct documentation	2013-05-14 01:58:43 +02:00
powerpc	powerpc/tm: Fix userspace stack corruption on signal delivery for active transactions	2013-06-01 08:29:23 +10:00
pps
prctl	seccomp: Make syscall skipping and nr changes more consistent	2012-10-02 21:14:29 +10:00
pti
ptp
rapidio	rapidio: documentation update for enumeration changes	2013-05-24 16:22:50 -07:00
RCU	Merge branches 'cbnum.2013.06.10a', 'doc.2013.06.10a', 'fixes.2013.06.10a', 'srcu.2013.06.10a' and 'tiny.2013.06.10a' into HEAD	2013-06-10 13:46:44 -07:00
s390	s390/cio: add condev keyword to cio_ignore	2013-05-02 15:50:20 +02:00
scheduler	sched: Rename sched.c as sched/core.c in comments and Documentation	2013-06-19 12:58:42 +02:00
scsi	[SCSI] qla2xxx: Update copyright dates information in LICENSE.qla2xxx file.	2013-04-06 11:31:30 +01:00
security	Smack: add support for modification of existing rules	2013-03-19 14:16:42 -07:00
serial	stallion: final cleanup	2013-06-03 14:31:39 -07:00
sh
sound	ALSA: hda - Add models for Dell headset jacks	2013-06-17 11:15:56 +02:00
spi	Documentation: remove __dev* attributes.	2013-01-03 15:57:16 -08:00
sysctl	perf: Drop sample rate when sampling is too slow	2013-06-23 11:52:57 +02:00
target	target: Simplify fabric sense data length handling	2012-09-17 17:12:58 -07:00
thermal	Thermal: update documentation for thermal_zone_device_register	2013-04-27 09:16:04 +08:00
timers	nohz_full: Document additional restrictions	2013-06-10 13:42:38 -07:00
trace	x86: Add NMI duration tracepoints	2013-06-23 11:52:58 +02:00
usb	Driver core patches for 3.11-rc1	2013-07-02 11:44:19 -07:00
vDSO
video4linux	[media] v4l2: Add a V4L2 driver for SI476X MFD	2013-04-18 21:20:34 -03:00
virtual	KVM fixes for 3.11	2013-07-03 13:21:40 -07:00
vm	mm: limit growth of 3% hardcoded other user reserve	2013-04-29 15:54:36 -07:00
w1	w1: add family based automatic module loading	2013-06-03 14:09:14 -07:00
watchdog	watchdog: core: dt: add support for the timeout-sec dt property	2013-03-01 12:48:36 +01:00
wimax
x86	x86, microcode, amd: Early microcode patch loading support for AMD	2013-05-30 20:19:25 -07:00
xtensa	xtensa: document MMUv3 setup sequence	2013-05-09 01:07:09 -07:00
zh_CN	gpio: update gpio Chinese documentation	2013-04-16 18:47:22 +09:00
.gitignore
00-INDEX	FMC: add documentation for the core	2013-06-18 15:41:03 -07:00
applying-patches.txt
atomic_ops.txt	Documentation: Memory barrier semantics of atomic_xchg()	2013-01-08 14:14:55 -08:00
bad_memory.txt
basic_profiling.txt
bcache.txt	bcache: clarify free/available/unused space	2013-05-15 00:42:52 -07:00
binfmt_misc.txt
braille-console.txt
bt8xxgpio.txt
btmrvl.txt
BUG-HUNTING
bus-virt-phys-mapping.txt	doc: fix broken references	2011-09-27 18:08:04 +02:00
cachetlb.txt
Changes
circular-buffers.txt
clk.txt	clk: add clk_ignore_unused option to keep boot clocks on	2013-04-27 23:03:43 -07:00
coccinelle.txt	Coccinelle: Add support to the SPFLAGS variable	2013-04-08 15:42:03 +02:00
CodingStyle	Documentation: remove depends on CONFIG_EXPERIMENTAL	2013-01-11 11:38:03 -08:00
cpu-hotplug.txt	Finally eradicate CONFIG_HOTPLUG	2013-06-03 14:20:18 -07:00
cpu-load.txt
cputopology.txt
crc32.txt	crc32: move long comment about crc32 fundamentals to Documentation/	2012-03-23 16:58:37 -07:00
dcdbas.txt
debugging-modules.txt
debugging-via-ohci1394.txt
dell_rbu.txt
devices.txt	block: remove refs to XD disks from documentation	2013-05-17 15:17:12 +02:00
digsig.txt	crypto: digital signature verification support	2011-11-09 12:10:37 +02:00
DMA-API-HOWTO.txt	Documentation/DMA-API-HOWTO.txt: fix typo	2013-02-27 19:10:23 -08:00
DMA-API.txt	dma-debug: New interfaces to debug dma mapping errors	2012-10-24 17:06:43 +02:00
DMA-attributes.txt	common: DMA-mapping: add DMA_ATTR_FORCE_CONTIGUOUS attribute	2012-11-29 03:30:34 -08:00
dma-buf-sharing.txt	dma-buf: replace dma_buf_export() with dma_buf_export_named()	2013-05-01 16:35:36 +05:30
DMA-ISA-LPC.txt
dmaengine.txt	Documentation: Fix multiple typo in Documentation	2012-03-07 16:08:24 +01:00
dmatest.txt	dmatest: do not allow to interrupt ongoing tests	2013-06-08 02:13:44 +05:30
dontdiff	x86: remove offsets.h from .gitignore and dontdiff	2012-11-19 14:10:53 +01:00
dynamic-debug-howto.txt	dynamic_debug: dynamic hex dump	2013-01-17 12:19:09 -08:00
edac.txt	Merge branch 'devel'	2012-07-29 21:11:05 -03:00
eisa.txt	MCA: delete all remaining traces of microchannel bus support.	2012-05-17 19:06:13 -04:00
email-clients.txt
flexible-arrays.txt
futex-requeue-pi.txt
gcov.txt
gpio.txt	Remove GENERIC_GPIO config option	2013-04-16 18:47:19 +09:00
highuid.txt
HOWTO	Documentation: Updated broken link in HOWTO	2013-06-03 14:22:57 -07:00
hw_random.txt	hwrng: Fix a wrong comment in Documentation/hw_random.txt	2013-03-10 18:16:36 +08:00
hwspinlock.txt	hwspinlock/core: register a bank of hwspinlocks in a single API call	2011-09-21 19:45:34 +03:00
init.txt
initrd.txt	Documentation/initrd.txt: Change the location of util-linux	2012-05-25 16:18:34 +02:00
intel_txt.txt	Documentation: remove depends on CONFIG_EXPERIMENTAL	2013-01-11 11:38:03 -08:00
Intel-IOMMU.txt
io_ordering.txt
io-mapping.txt
iostats.txt	iostats.txt: add easy-to-find description for field 6	2013-04-29 15:18:50 +02:00
IPMI.txt	ipmi: add options to disable openfirmware and PCI scanning	2013-02-27 19:10:21 -08:00
IRQ-affinity.txt
IRQ-domain.txt	irqdomain: update documentation	2012-12-05 23:52:10 +00:00
IRQ.txt
irqflags-tracing.txt
isapnp.txt
java.txt
kernel-doc-nano-HOWTO.txt	Kernel-doc: Convention: Use a "Return" section to describe return values	2012-11-27 21:08:57 +01:00
kernel-docs.txt	doc: fix broken references	2011-09-27 18:08:04 +02:00
kernel-parameters.txt	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2013-07-03 14:04:58 -07:00
kernel-per-CPU-kthreads.txt	kthread: Add kworker kthreads to OS-jitter documentation	2013-06-10 13:42:38 -07:00
kmemcheck.txt
kmemleak.txt	kmemleak: Handle percpu memory allocation	2011-12-02 16:12:42 +00:00
kobject.txt	Documentation: Fix "struct kobj_type" to include newer members.	2012-09-04 16:06:34 -07:00
kprobes.txt
kref.txt	kref: Add kref_get_unless_zero documentation	2012-11-28 18:36:06 +10:00
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	locking/stat: Fix a typo	2013-02-19 08:42:37 +01:00
lockup-watchdogs.txt	watchdog: Update documentation	2012-02-11 15:11:28 +01:00
logo.gif
logo.txt
magic-number.txt	wanrouter: completely decouple obsolete code from kernel.	2013-01-31 19:20:33 -05:00
Makefile	mei: move doc files Documentation/misc-devices/mei	2012-05-09 13:59:09 -07:00
ManagementStyle	Documentation: ManagementStyle: fixed typo	2012-06-28 12:03:15 +02:00
md.txt	MD: Fix typos in MD documentation	2013-04-24 11:42:42 +10:00
media-framework.txt	[media] Documentation/media-framework.txt: fix a sentence	2013-02-08 13:27:13 -02:00
memory-barriers.txt	Documentation: Memory barrier semantics of atomic_xchg()	2013-01-08 14:14:55 -08:00
memory-hotplug.txt	hotplug: update nodemasks management	2012-12-12 17:38:33 -08:00
mono.txt	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
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	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
percpu-rw-semaphore.txt	percpu-rw-semaphore: fix documentation typos	2012-09-26 19:56:15 +02:00
pi-futex.txt
pinctrl.txt	pinctrl: rip out the direct pinconf API	2013-06-25 12:54:56 +02:00
pnp.txt
preempt-locking.txt
printk-formats.txt	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-04-30 13:47:37 -07:00
pwm.txt	pwm: add devm_pwm_get() and devm_pwm_put()	2012-09-10 17:05:45 +02:00
ramoops.txt	pstore/ftrace: Convert to its own enable/disable debugfs knob	2012-09-06 22:16:58 -07:00
rbtree.txt	rbtree: move augmented rbtree functionality to rbtree_augmented.h	2012-10-09 16:22:40 +09:00
remoteproc.txt	remoteproc: add rproc_report_crash function to notify rproc crashes	2012-09-18 12:53:22 +03:00
rfkill.txt	doc: fix broken references	2011-09-27 18:08:04 +02:00
robust-futex-ABI.txt
robust-futexes.txt
rpmsg.txt	Documentation: remove __dev* attributes.	2013-01-03 15:57:16 -08:00
rt-mutex-design.txt	sched: Rename sched.c as sched/core.c in comments and Documentation	2013-06-19 12:58:42 +02:00
rt-mutex.txt
rtc.txt	rtc-proc: permit the /proc/driver/rtc device to use other devices	2012-10-06 03:05:01 +09:00
SAK.txt
SecurityBugs
serial-console.txt
sgi-ioc4.txt
sgi-visws.txt
SM501.txt
smsc_ece1099.txt	mfd: smsc: Add support for smsc gpio io/keypad driver	2012-10-01 15:27:48 +02:00
sparse.txt	Documentation/sparse.txt: document context annotations for lock checking	2012-12-17 17:15:23 -08:00
spinlocks.txt	sched: Rename sched.c as sched/core.c in comments and Documentation	2013-06-19 12:58:42 +02:00
stable_api_nonsense.txt
stable_kernel_rules.txt	stable: Allow merging of backports for serious user-visible performance issues	2012-06-25 12:11:58 -07:00
static-keys.txt	Documentation: Fix typo in multiple files in Documentation	2012-04-16 14:37:13 +02:00
SubmitChecklist	Finally eradicate CONFIG_HOTPLUG	2013-06-03 14:20:18 -07:00
SubmittingDrivers
SubmittingPatches	checkpatch: add Suggested-by as a standard signature	2013-04-29 18:28:20 -07:00
svga.txt
sysfs-rules.txt
sysrq.txt	Documentation/sysrq: fix inconstistent help message of sysrq key	2013-04-30 17:04:10 -07:00
this_cpu_ops.txt	percpu: add documentation on this_cpu operations	2013-04-04 10:24:53 -07:00
unaligned-memory-access.txt
unicode.txt
unshare.txt
vfio.txt	vfio: Trivial Documentation correction	2012-09-21 10:48:03 -06:00
VGA-softcursor.txt
vgaarbiter.txt	misc latin1 to utf8 conversions	2012-01-02 13:04:55 +01:00
video-output.txt
vme_api.txt	VME: Move API documentation to Documentation folder	2012-05-08 16:01:34 -07:00
volatile-considered-harmful.txt
workqueue.txt	workqueue: reimplement WQ_HIGHPRI using a separate worker_pool	2012-07-13 22:24:45 -07:00
ww-mutex-design.txt	mutex: Add support for wound/wait style locks	2013-06-26 12:10:56 +02:00
xz.txt
zorro.txt