# 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/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 f60c55a94e1d127186566f06294f2dadd966e9b4 # < make -s -j 8 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 allmodconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_KCOV=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_GCC_PLUGIN_CYC_COMPLEXITY=n # Added to kconfig CONFIG_GCC_PLUGIN_SANCOV=n # Added to kconfig CONFIG_GCC_PLUGIN_LATENT_ENTROPY=n # Added to kconfig CONFIG_GCC_PLUGIN_STRUCTLEAK=n # Added to kconfig CONFIG_GCC_PLUGIN_RANDSTRUCT=n # Added to kconfig CONFIG_UML_NET=n # Added to kconfig CONFIG_UML_NET_ETHERTAP=n # Added to kconfig CONFIG_UML_NET_TUNTAP=n # Added to kconfig CONFIG_UML_NET_SLIP=n # Added to kconfig CONFIG_UML_NET_DAEMON=n # Added to kconfig CONFIG_UML_NET_VDE=n # Added to kconfig CONFIG_UML_NET_MCAST=n # Added to kconfig CONFIG_UML_NET_PCAP=n # Added to kconfig CONFIG_UML_NET_SLIRP=n # Added to kconfig CONFIG_GCOV_KERNEL=n # yes \n | make -s -j 8 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 oldconfig yes: standard output: Broken pipe # make -s -j 8 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 /kisskb/src/arch/um/os-Linux/signal.c: In function 'timer_real_alarm_handler': /kisskb/src/arch/um/os-Linux/signal.c:93:1: warning: the frame size of 2960 bytes is larger than 2048 bytes [-Wframe-larger-than=] } ^ /kisskb/src/arch/um/os-Linux/signal.c: In function 'sig_handler_common': /kisskb/src/arch/um/os-Linux/signal.c:51:1: warning: the frame size of 2976 bytes is larger than 2048 bytes [-Wframe-larger-than=] } ^ /kisskb/src/security/apparmor/policy_unpack.c: In function 'unpack_profile': /kisskb/src/security/apparmor/policy_unpack.c:523:9: warning: 'pos' may be used uninitialized in this function [-Wmaybe-uninitialized] str[pos] = ':'; ^ /kisskb/src/security/apparmor/policy_unpack.c:494:14: note: 'pos' was declared here int c, j, pos, size2 = unpack_strdup(e, &str, NULL); ^ /kisskb/src/mm/hmm.c: In function 'hmm_vma_walk_pud': /kisskb/src/mm/hmm.c:753:9: error: implicit declaration of function 'pud_pfn' [-Werror=implicit-function-declaration] pfn = pud_pfn(pud) + ((addr & ~PUD_MASK) >> PAGE_SHIFT); ^ cc1: some warnings being treated as errors make[2]: *** [/kisskb/src/scripts/Makefile.build:280: mm/hmm.o] Error 1 make[1]: *** [/kisskb/src/Makefile:1087: mm] Error 2 make[1]: *** Waiting for unfinished jobs.... /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' [-Werror=implicit-function-declaration] irq = pci_irq_vector(pci_pdev, irqid); ^ /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' [-Werror=implicit-function-declaration] ret = pci_alloc_irq_vectors(pci_pdev, ^ /kisskb/src/drivers/crypto/inside-secure/safexcel.c:1439:10: error: 'PCI_IRQ_MSI' undeclared (first use in this function) PCI_IRQ_MSI | PCI_IRQ_MSIX); ^ /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) PCI_IRQ_MSI | PCI_IRQ_MSIX); ^ /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[2]: *** [/kisskb/src/scripts/Makefile.build:497: drivers/crypto] Error 2 make[1]: *** [/kisskb/src/Makefile:1087: drivers] Error 2 make: *** [Makefile:179: sub-make] Error 2 Command 'make -s -j 8 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_um-allmodconfig_um-x86_64 # Build took: 0:06:07.397111