Linus Torvalds 8cc748aa76 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security ... Pull security layer updates from James Morris: "Highlights: - Smack adds secmark support for Netfilter - /proc/keys is now mandatory if CONFIG_KEYS=y - TPM gets its own device class - Added TPM 2.0 support - Smack file hook rework (all Smack users should review this!)" * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (64 commits) cipso: don't use IPCB() to locate the CIPSO IP option SELinux: fix error code in policydb_init() selinux: add security in-core xattr support for pstore and debugfs selinux: quiet the filesystem labeling behavior message selinux: Remove unused function avc_sidcmp() ima: /proc/keys is now mandatory Smack: Repair netfilter dependency X.509: silence asn1 compiler debug output X.509: shut up about included cert for silent build KEYS: Make /proc/keys unconditional if CONFIG_KEYS=y MAINTAINERS: email update tpm/tpm_tis: Add missing ifdef CONFIG_ACPI for pnp_acpi_device smack: fix possible use after frees in task_security() callers smack: Add missing logging in bidirectional UDS connect check Smack: secmark support for netfilter Smack: Rework file hooks tpm: fix format string error in tpm-chip.c char/tpm/tpm_crb: fix build error smack: Fix a bidirectional UDS connect check typo smack: introduce a special case for tmpfs in smack_d_instantiate() ...		2015-02-11 20:25:11 -08:00
..
agp	agp: Fix up email address & attributions in AGP MODULE_AUTHOR tags	2014-12-23 20:03:10 +10:00
hw_random	Driver core patches for 3.19-rc1	2014-12-14 16:10:09 -08:00
ipmi	ipmi: Fix compile warning with tv_usec	2014-12-30 13:34:36 -06:00
mwave	drivers/char: delete non-required instances of include <linux/init.h>	2014-02-07 15:10:19 -08:00
pcmcia	char: synclink: Remove WARN_ON for bad port count	2014-07-10 16:07:46 -07:00
tpm	tpm/tpm_tis: Add missing ifdef CONFIG_ACPI for pnp_acpi_device	2015-01-22 13:37:33 +11:00
xilinx_hwicap	char: xilinx_hwicap: Remove .owner field for driver	2014-09-23 23:13:13 -07:00
xillybus	char: xillybus: drop owner assignment from platform_drivers	2014-10-20 16:20:21 +02:00
apm-emulation.c
applicom.c	applicom: dereferencing NULL on error path	2014-05-27 17:43:12 -07:00
applicom.h
bfin-otp.c
bsr.c	bsr: avoid format string leaking into device name	2014-07-09 16:59:15 -07:00
ds1302.c
ds1620.c
dsp56k.c	drivers/char/dsp56k.c: drop check for negativity of unsigned parameter	2014-07-17 18:38:37 -07:00
dtlk.c
efirtc.c
generic_nvram.c
genrtc.c
hangcheck-timer.c	hangcheck-timer: cleanup casting in hangcheck_init()	2014-11-07 11:24:01 -08:00
hpet.c	ACPICA: Resources: Provide common part for struct acpi_resource_address structures.	2015-01-26 16:09:56 +01:00
i8k.c	i8k: Fix temperature bug handling in i8k_get_temp()	2014-11-26 19:29:36 -08:00
Kconfig	xillybus: Move out of staging	2014-09-23 23:44:16 -07:00
lp.c
Makefile	xillybus: Move out of staging	2014-09-23 23:44:16 -07:00
mbcs.c
mbcs.h
mem.c	/dev/mem: Use more consistent data types	2014-11-10 15:59:21 +01:00
misc.c	Revert "misc: always assign miscdevice to file->private_data in open()"	2014-11-14 16:49:49 -08:00
mmtimer.c
msm_smd_pkt.c
mspec.c
nsc_gpio.c
nvram.c
nwbutton.c
nwbutton.h
nwflash.c
pc8736x_gpio.c
ppdev.c
ps3flash.c
random.c	random: Fix fast_mix() function	2015-02-09 12:28:42 -08:00
raw.c	Return short read or 0 at end of a raw device, not EIO	2014-10-31 06:33:26 -04:00
rtc.c
scx200_gpio.c
snsc_event.c
snsc.c
snsc.h
sonypi.c	char: drop owner assignment from platform_drivers	2014-10-20 16:20:19 +02:00
tb0219.c	char: drop owner assignment from platform_drivers	2014-10-20 16:20:19 +02:00
tile-srom.c	char: tile-srom: Add real platform bus parent	2014-10-02 10:19:34 -04:00
tlclk.c
toshiba.c
ttyprintk.c	ttyprintk: Allow built as a module	2014-04-16 14:21:06 -07:00
uv_mmtimer.c
virtio_console.c	virtio_console: fix sparse warnings	2014-12-09 12:06:33 +02:00