summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jm...Linus Torvalds2018-06-071-7/+5
|\
| * Merge branch 'smack-for-4.18' of https://github.com/cschaufler/next-smack int...James Morris2018-06-051-7/+5
| |\
| | * Smack: Fix memory leak in smack_inode_getsecctxCasey Schaufler2018-06-051-7/+5
* | | Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmor...Linus Torvalds2018-06-0717-269/+350
|\ \ \
| * \ \ Merge tag 'tpmdd-next-20180602' of git://git.infradead.org/users/jjs/linux-tp...James Morris2018-06-042-23/+19
| |\ \ \
| | * | | tpm: fix race condition in tpm_common_write()Tadeusz Struk2018-05-302-23/+19
| * | | | Merge tag 'tpmdd-next-20180518' of git://git.infradead.org/users/jjs/linux-tp...James Morris2018-05-1815-246/+331
| |\| | | | | |/ / | |/| |
| | * | tpm: reduce polling time to usecs for even finer granularityNayna Jain2018-05-182-3/+6
| | * | tpm: replace kmalloc() + memcpy() with kmemdup()Ji-Hun Kim2018-05-141-2/+1
| | * | tpm: replace kmalloc() + memcpy() with kmemdup()Ji-Hun Kim2018-05-141-3/+1
| | * | tpm: fix use after free in tpm2_load_context()Tadeusz Struk2018-05-141-1/+2
| | * | tpm: reduce poll sleep time in tpm_transmit()Nayna Jain2018-05-143-10/+5
| | * | tpm_tis: verify locality released before returning from release_localityJerry Snitselaar2018-05-141-1/+46
| | * | tpm: tpm_crb: relinquish locality on error path.Winkler, Tomas2018-05-101-3/+7
| | * | tpm/st33zp24: Fix spelling mistake in macro ST33ZP24_TISREGISTER_UKNOWNColin Ian King2018-05-091-2/+2
| | * | tpm: Move eventlog declarations to its own headerThiebaud Weksteen2018-05-098-30/+41
| | * | tpm: Move shared eventlog functions to common.cThiebaud Weksteen2018-05-094-184/+214
| | * | tpm: Move eventlog files to a subdirectoryThiebaud Weksteen2018-05-096-9/+9
| | * | tpm: Add explicit endianness castThiebaud Weksteen2018-05-091-2/+2
| | * | tpm: st33zp24: remove redundant null check on chipColin Ian King2018-05-091-2/+0
| | * | tpm: move the delay_msec increment after sleep in tpm_transmit()Nayna Jain2018-05-091-1/+2
* | | | Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2018-06-0716-84/+377
|\ \ \ \
| * | | | EVM: unlock on error path in evm_read_xattrs()Dan Carpenter2018-06-011-1/+3
| * | | | EVM: prevent array underflow in evm_write_xattrs()Dan Carpenter2018-05-311-1/+1
| * | | | EVM: Fix null dereference on xattr when xattr fails to allocateColin Ian King2018-05-311-2/+4
| * | | | EVM: fix memory leak of temporary buffer 'temp'Colin Ian King2018-05-311-0/+2
| * | | | IMA: use list_splice_tail_init_rcu() instead of its open coded variantPetko Manolov2018-05-311-15/+2
| * | | | ima: use match_string() helperYisheng Xie2018-05-311-7/+4
| * | | | ima: fix updating the ima_appraise flagMimi Zohar2018-05-221-9/+19
| * | | | ima: based on policy verify firmware signatures (pre-allocated buffer)Mimi Zohar2018-05-221-0/+1
| * | | | ima: define a new policy condition based on the filesystem nameMimi Zohar2018-05-222-2/+25
| * | | | EVM: Allow runtime modification of the set of verified xattrsMatthew Garrett2018-05-186-4/+202
| * | | | EVM: turn evm_config_xattrnames into a listMatthew Garrett2018-05-183-39/+57
| * | | | integrity: Add an integrity directory in securityfsMatthew Garrett2018-05-174-4/+52
| * | | | ima: Remove unused variable ima_initializedPetr Vorel2018-05-172-6/+2
| * | | | ima: Unify loggingPetr Vorel2018-05-173-2/+9
| * | | | ima: Reflect correct permissions for policyPetr Vorel2018-05-171-0/+2
| |/ / /
* | | | Merge tag 'devicetree-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2018-06-0745-49/+320
|\ \ \ \
| * | | | dt-bindings: submitting-patches: add guidance on patch content and subjectRob Herring2018-06-051-1/+8
| * | | | of: platform: stop accessing invalid dev in of_platform_device_destroySrinivas Kandagatla2018-06-041-2/+3
| * | | | dt-bindings: net: ravb: Add support for r8a77990 SoCYoshihiro Shimoda2018-06-041-0/+1
| * | | | dt-bindings: Add vendor prefix for ArcherMindManivannan Sadhasivam2018-05-311-0/+1
| * | | | dt-bindings: fsi-master-gpio: Document "no-gpio-delays" propertyBenjamin Herrenschmidt2018-05-311-0/+4
| * | | | dt-bindings: Add vendor prefix for Logic PDVladimir Zapolskiy2018-05-231-0/+1
| * | | | of: overlay: validate offset from property fixupsFrank Rowand2018-05-231-0/+5
| * | | | of: unittest: for strings, account for trailing \0 in property length fieldStefan M Schaeckeler2018-05-221-4/+4
| * | | | drm: rcar-du: disable dtc graph-endpoint warnings on DT overlaysRob Herring2018-05-151-0/+7
| * | | | kbuild: disable new dtc graph and unit-address warningsRob Herring2018-05-141-0/+3
| * | | | scripts/dtc: Update to upstream version v1.4.6-21-g84e414b0b5bcRob Herring2018-05-146-16/+261
| * | | | Merge tag 'devicetree-fixes-for-4.17' into dt/next to pick-up fixesRob Herring2018-05-1411-18/+42
| |\ \ \ \