summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next-seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2019-01-0211-24/+1411
|\
| * Merge tag 'seccomp-next-part2' of https://git.kernel.org/pub/scm/linux/kernel...James Morris2018-12-172-3/+2
| |\
| | * seccomp, s390: fix build for syscall type changeTycho Andersen2018-12-131-1/+1
| | * seccomp: fix poor type promotionTycho Andersen2018-12-131-2/+1
| * | Merge tag 'seccomp-next' of https://git.kernel.org/pub/scm/linux/kernel/git/k...James Morris2018-12-1210-23/+1411
| |\|
| | * samples: add an example of seccomp user trapTycho Andersen2018-12-113-1/+382
| | * seccomp: add a return code to trap to userspaceTycho Andersen2018-12-116-10/+1017
| | * seccomp: switch system call argument type to void *Tycho Andersen2018-12-113-6/+6
| | * seccomp: hoist struct seccomp_data recalculation higherTycho Andersen2018-12-111-6/+6
* | | Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2019-01-0220-93/+861
|\ \ \
| * | | integrity: Remove references to module keyringThiago Jung Bauermann2018-12-172-4/+2
| * | | Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/gi...James Morris2018-12-1720-92/+862
| |\ \ \
| | * | | ima: Use inode_is_open_for_writeNikolay Borisov2018-12-121-1/+1
| | * | | ima: Support platform keyring for kernel appraisalNayna Jain2018-12-121-2/+12
| | * | | efi: Allow the "db" UEFI variable to be suppressedJosh Boyer2018-12-121-10/+35
| | * | | efi: Import certificates from UEFI Secure BootJosh Boyer2018-12-122-1/+173
| | * | | efi: Add an EFI signature blob parserDave Howells2018-12-123-1/+119
| | * | | efi: Add EFI signature data typesDave Howells2018-12-121-0/+25
| | * | | integrity: Load certs to the platform keyringNayna Jain2018-12-123-24/+86
| | * | | integrity: Define a trusted platform keyringNayna Jain2018-12-125-16/+81
| | * | | selftests/ima: kexec_load syscall testMimi Zohar2018-12-114-0/+70
| | * | | ima: don't measure/appraise files on efivarfsMimi Zohar2018-12-111-1/+3
| | * | | x86/ima: retry detecting secure boot modeMimi Zohar2018-12-113-3/+47
| | * | | docs: Extend trusted keys documentation for TPM 2.0Stefan Berger2018-12-111-1/+30
| | * | | x86/ima: define arch_get_ima_policy() for x86Eric Richter2018-12-113-2/+27
| | * | | ima: add support for arch specific policiesNayna Jain2018-12-112-2/+75
| | * | | ima: refactor ima_init_policy()Nayna Jain2018-12-111-41/+56
| | * | | ima: prevent kexec_load syscall based on runtime secureboot flagNayna Jain2018-12-111-6/+13
| | * | | x86/ima: define arch_ima_get_securebootNayna Jain2018-11-133-0/+28
| | * | | integrity: support new struct public_key_signature encoding fieldMimi Zohar2018-11-131-0/+1
* | | | | Merge tag 'iommu-updates-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2019-01-0146-917/+1612
|\ \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| *-------------. \ \ \ \ Merge branches 'iommu/fixes', 'arm/renesas', 'arm/mediatek', 'arm/tegra', 'ar...Joerg Roedel2018-12-2045-914/+1613
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | * | | | | iommu: Check for iommu_ops == NULL in iommu_probe_device()Joerg Roedel2018-12-201-1/+5
| | | | | | | | | * | | | | ACPI/IORT: Don't call iommu_ops->add_device directlyJoerg Roedel2018-12-171-2/+2
| | | | | | | | | * | | | | iommu/of: Don't call iommu_ops->add_device directlyJoerg Roedel2018-12-171-3/+3
| | | | | | | | | * | | | | iommu: Consolitate ->add/remove_device() callsJoerg Roedel2018-12-172-26/+28
| | | | | | | | | * | | | | iommu/sysfs: Rename iommu_release_device()Joerg Roedel2018-12-171-6/+6
| | | | | | | | | * | | | | dmaengine: sh: rcar-dmac: Use device_iommu_mapped()Joerg Roedel2018-12-171-1/+1
| | | | | | | | | * | | | | xhci: Use device_iommu_mapped()Joerg Roedel2018-12-171-1/+1
| | | | | | | | | * | | | | powerpc/iommu: Use device_iommu_mapped()Joerg Roedel2018-12-172-4/+4
| | | | | | | | | * | | | | ACPI/IORT: Use device_iommu_mapped()Joerg Roedel2018-12-171-1/+1
| | | | | | | | | * | | | | iommu/of: Use device_iommu_mapped()Joerg Roedel2018-12-171-1/+1
| | | | | | | | | * | | | | driver core: Introduce device_iommu_mapped() functionJoerg Roedel2018-12-171-0/+10
| | | | | | | | | * | | | | iommu/tegra: Use helper functions to access dev->iommu_fwspecJoerg Roedel2018-12-171-1/+1
| | | | | | | | | * | | | | iommu/qcom: Use helper functions to access dev->iommu_fwspecJoerg Roedel2018-12-171-8/+10
| | | | | | | | | * | | | | iommu/of: Use helper functions to access dev->iommu_fwspecJoerg Roedel2018-12-171-3/+7
| | | | | | | | | * | | | | iommu/mediatek: Use helper functions to access dev->iommu_fwspecJoerg Roedel2018-12-172-21/+28
| | | | | | | | | * | | | | iommu/ipmmu-vmsa: Use helper functions to access dev->iommu_fwspecJoerg Roedel2018-12-171-4/+8
| | | | | | | | | * | | | | iommu/dma: Use helper functions to access dev->iommu_fwspecJoerg Roedel2018-12-171-1/+1
| | | | | | | | | * | | | | iommu/arm-smmu: Use helper functions to access dev->iommu_fwspecJoerg Roedel2018-12-172-13/+15