summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'integrity-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2021-09-0214-76/+352
|\
| * IMA: reject unknown hash algorithms in ima_get_hash_algoTHOBY Simon2021-08-241-1/+2
| * Merge branch 'restrict-digest-alg-v8' into next-integrityMimi Zohar2021-08-187-35/+268
| |\
| | * IMA: prevent SETXATTR_CHECK policy rules with unavailable algorithmsTHOBY Simon2021-08-161-0/+6
| | * IMA: introduce a new policy option func=SETXATTR_CHECKTHOBY Simon2021-08-165-18/+104
| | * IMA: add a policy option to restrict xattr hash algorithms on appraisalTHOBY Simon2021-08-162-5/+75
| | * IMA: add support to restrict the hash algorithms used for file appraisalTHOBY Simon2021-08-165-12/+41
| | * IMA: block writes of the security.ima xattr with unsupported algorithmsTHOBY Simon2021-08-162-4/+47
| | * IMA: remove the dependency on CRYPTO_MD5THOBY Simon2021-08-161-1/+0
| |/
| * Merge branch 'ima-buffer-measurement-changes-v4' into next-integrityMimi Zohar2021-07-238-38/+79
| |\
| | * ima: Add digest and digest_len params to the functions to measure a bufferRoberto Sassu2021-07-238-19/+39
| | * ima: Return int in the functions to measure a bufferRoberto Sassu2021-07-233-28/+37
| | * ima: Introduce ima_get_current_hash_algo()Roberto Sassu2021-07-232-1/+13
| |/
| * IMA: remove -Wmissing-prototypes warningAustin Kim2021-07-231-1/+1
* | Merge tag 'hardening-v5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2021-09-023-87/+242
|\ \
| * | lib/test_stackinit: Add assigned initializersKees Cook2021-08-221-55/+114
| * | lib/test_stackinit: Allow building stand-aloneKees Cook2021-08-221-3/+69
| * | lib/test_stackinit: Fix static initializer testKees Cook2021-07-261-13/+7
| * | hardening: Clarify Kconfig text for auto-var-initKees Cook2021-07-211-20/+32
| * | hardening: Introduce CONFIG_ZERO_CALL_USED_REGSKees Cook2021-07-212-0/+24
| |/
* | Merge tag 'linux-kselftest-kunit-5.15-rc1' of git://git.kernel.org/pub/scm/li...Linus Torvalds2021-09-0212-24/+398
|\ \
| * | kunit: Print test statistics on failureDavid Gow2021-08-132-1/+110
| * | kunit: tool: make --raw_output support only showing kunit outputDaniel Latypov2021-08-134-12/+30
| * | kunit: tool: add --kernel_args to allow setting module paramsDaniel Latypov2021-08-133-10/+36
| * | kunit: ubsan integrationUriel Guajardo2021-08-131-0/+3
| * | fat: Add KUnit tests for checksums and timestampsDavid Gow2021-08-135-1/+219
| |/
* | Merge tag 'memblock-v5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2021-09-021-0/+10
|\ \
| * | memblock: Check memory add/cap orderingGeert Uytterhoeven2021-08-111-0/+5
| * | memblock: Add missing debug code to memblock_add_node()Geert Uytterhoeven2021-08-111-0/+5
* | | Merge tag 'dma-mapping-5.15' of git://git.infradead.org/users/hch/dma-mappingLinus Torvalds2021-09-0230-443/+310
|\ \ \
| * | | hexagon: use the generic global coherent poolChristoph Hellwig2021-08-192-46/+12
| * | | dma-mapping: make the global coherent pool conditionalChristoph Hellwig2021-08-192-30/+37
| * | | dma-mapping: add a dma_init_global_coherent helperChristoph Hellwig2021-08-182-19/+15
| * | | dma-mapping: simplify dma_init_coherent_memoryChristoph Hellwig2021-08-181-45/+33
| * | | dma-mapping: allow using the global coherent pool for !ARMChristoph Hellwig2021-08-181-0/+2
| * | | ARM/nommu: use the generic dma-direct code for non-coherent devicesChristoph Hellwig2021-08-182-169/+9
| * | | dma-direct: add support for dma_coherent_default_memoryChristoph Hellwig2021-08-182-0/+19
| * | | dma-mapping: return an unsigned int from dma_map_sg{,_attrs}Christoph Hellwig2021-08-142-5/+6
| * | | dma-mapping: disallow .map_sg operations from returning zero on errorLogan Gunthorpe2021-08-091-3/+1
| * | | dma-mapping: return error code from dma_dummy_map_sg()Martin Oliveira2021-08-091-1/+1
| * | | x86/amd_gart: don't set failed sg dma_address to DMA_MAPPING_ERRORLogan Gunthorpe2021-08-091-2/+0
| * | | x86/amd_gart: return error code from gart_map_sg()Martin Oliveira2021-08-091-7/+9
| * | | xen: swiotlb: return error code from xen_swiotlb_map_sg()Martin Oliveira2021-08-091-1/+1
| * | | parisc: return error code from .map_sg() opsMartin Oliveira2021-08-092-2/+2
| * | | sparc/iommu: don't set failed sg dma_address to DMA_MAPPING_ERRORLogan Gunthorpe2021-08-092-4/+0
| * | | sparc/iommu: return error codes from .map_sg() opsMartin Oliveira2021-08-093-5/+5
| * | | s390/pci: don't set failed sg dma_address to DMA_MAPPING_ERRORLogan Gunthorpe2021-08-091-1/+0
| * | | s390/pci: return error code from s390_dma_map_sg()Martin Oliveira2021-08-091-5/+7
| * | | powerpc/iommu: don't set failed sg dma_address to DMA_MAPPING_ERRORLogan Gunthorpe2021-08-091-2/+0
| * | | powerpc/iommu: return error code from .map_sg() opsMartin Oliveira2021-08-093-5/+6