diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-08 03:06:28 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-08 03:06:28 +0300 |
| commit | a7d4026834f8263a8a4eabeb753e3747988ef0d2 (patch) | |
| tree | 5204ced6419a70d8539318fd20098e8e733f4213 /fs/timerfd.c | |
| parent | 98ced886dd79a7028d203ed8adea8452bbfb47b6 (diff) | |
| parent | a750cfde1397dbbee1efe7737c2e952d6fc2d878 (diff) | |
| download | linux-a7d4026834f8263a8a4eabeb753e3747988ef0d2.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull security layer fixes from James Morris:
"Bugfixes for TPM and SELinux"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
IB/core: Fix static analysis warning in ib_policy_change_task
IB/core: Fix uninitialized variable use in check_qp_port_pkey_settings
tpm: do not suspend/resume if power stays on
tpm: use tpm2_pcr_read() in tpm2_do_selftest()
tpm: use tpm_buf functions in tpm2_pcr_read()
tpm_tis: make ilb_base_addr static
tpm: consolidate the TPM startup code
tpm: Enable CLKRUN protocol for Braswell systems
tpm/tpm_crb: fix priv->cmd_size initialisation
tpm: fix a kernel memory leak in tpm-sysfs.c
tpm: Issue a TPM2_Shutdown for TPM2 devices.
Add "shutdown" to "struct class".
Diffstat (limited to 'fs/timerfd.c')
0 files changed, 0 insertions, 0 deletions