# git rev-parse -q --verify f60c55a94e1d127186566f06294f2dadd966e9b4^{commit} f60c55a94e1d127186566f06294f2dadd966e9b4 already have revision, skipping fetch # git checkout -q -f -B kisskb f60c55a94e1d127186566f06294f2dadd966e9b4 # git clean -qxdf # < git log -1 # commit f60c55a94e1d127186566f06294f2dadd966e9b4 # Merge: 734d1ed83e1f 95ae251fe828 # Author: Linus Torvalds # Date: Wed Sep 18 16:59:14 2019 -0700 # # Merge tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt # # Pull fs-verity support from Eric Biggers: # "fs-verity is a filesystem feature that provides Merkle tree based # hashing (similar to dm-verity) for individual readonly files, mainly # for the purpose of efficient authenticity verification. # # This pull request includes: # # (a) The fs/verity/ support layer and documentation. # # (b) fs-verity support for ext4 and f2fs. # # Compared to the original fs-verity patchset from last year, the UAPI # to enable fs-verity on a file has been greatly simplified. Lots of # other things were cleaned up too. # # fs-verity is planned to be used by two different projects on Android; # most of the userspace code is in place already. Another userspace tool # ("fsverity-utils"), and xfstests, are also available. e2fsprogs and # f2fs-tools already have fs-verity support. Other people have shown # interest in using fs-verity too. # # I've tested this on ext4 and f2fs with xfstests, both the existing # tests and the new fs-verity tests. This has also been in linux-next # since July 30 with no reported issues except a couple minor ones I # found myself and folded in fixes for. # # Ted and I will be co-maintaining fs-verity" # # * tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt: # f2fs: add fs-verity support # ext4: update on-disk format documentation for fs-verity # ext4: add fs-verity read support # ext4: add basic fs-verity support # fs-verity: support builtin file signatures # fs-verity: add SHA-512 support # fs-verity: implement FS_IOC_MEASURE_VERITY ioctl # fs-verity: implement FS_IOC_ENABLE_VERITY ioctl # fs-verity: add data verification hooks for ->readpages() # fs-verity: add the hook for file ->setattr() # fs-verity: add the hook for file ->open() # fs-verity: add inode and superblock fields # fs-verity: add Kconfig and the helper functions for hashing # fs: uapi: define verity bit for FS_IOC_GETFLAGS # fs-verity: add UAPI header # fs-verity: add MAINTAINERS file entry # fs-verity: add a documentation file # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux-ld --version # < git log --format=%s --max-count=1 f60c55a94e1d127186566f06294f2dadd966e9b4 # < make -s -j 10 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux- randconfig KCONFIG_SEED=0x77D33DC0 # Added to kconfig CONFIG_PREVENT_FIRMWARE_BUILD=y # yes \n | make -s -j 10 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux- oldconfig yes: standard output: Broken pipe # make -s -j 10 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux- /kisskb/src/drivers/crypto/inside-secure/safexcel.c: In function 'safexcel_request_ring_irq': /kisskb/src/drivers/crypto/inside-secure/safexcel.c:1104:9: error: implicit declaration of function 'pci_irq_vector'; did you mean 'rcu_irq_enter'? [-Werror=implicit-function-declaration] irq = pci_irq_vector(pci_pdev, irqid); ^~~~~~~~~~~~~~ rcu_irq_enter /kisskb/src/drivers/crypto/inside-secure/safexcel.c: In function 'safexcel_probe_generic': /kisskb/src/drivers/crypto/inside-secure/safexcel.c:1436:9: error: implicit declaration of function 'pci_alloc_irq_vectors'; did you mean 'pci_alloc_consistent'? [-Werror=implicit-function-declaration] ret = pci_alloc_irq_vectors(pci_pdev, ^~~~~~~~~~~~~~~~~~~~~ pci_alloc_consistent /kisskb/src/drivers/crypto/inside-secure/safexcel.c:1439:10: error: 'PCI_IRQ_MSI' undeclared (first use in this function); did you mean 'PCI_IO_BASE'? PCI_IRQ_MSI | PCI_IRQ_MSIX); ^~~~~~~~~~~ PCI_IO_BASE /kisskb/src/drivers/crypto/inside-secure/safexcel.c:1439:10: note: each undeclared identifier is reported only once for each function it appears in /kisskb/src/drivers/crypto/inside-secure/safexcel.c:1439:24: error: 'PCI_IRQ_MSIX' undeclared (first use in this function); did you mean 'PCI_IO_SIZE'? PCI_IRQ_MSI | PCI_IRQ_MSIX); ^~~~~~~~~~~~ PCI_IO_SIZE /kisskb/src/drivers/crypto/inside-secure/safexcel.c: In function 'safexcel_init': /kisskb/src/drivers/crypto/inside-secure/safexcel.c:1794:6: warning: unused variable 'rc' [-Wunused-variable] int rc; ^~ cc1: some warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:281: drivers/crypto/inside-secure/safexcel.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:497: drivers/crypto/inside-secure] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:497: drivers/crypto] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1087: drivers] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:179: sub-make] Error 2 Command 'make -s -j 10 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus-rand_arm64-randconfig_arm64-gcc8 # Build took: 0:07:59.517956