# 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/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/aarch64-linux-gcc --version # < /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/aarch64-linux-ld --version # < git log --format=%s --max-count=1 f60c55a94e1d127186566f06294f2dadd966e9b4 # < make -s -j 10 ARCH=arm64 O=/kisskb/build/linus_arm64-defconfig_arm64-gcc5.4 CROSS_COMPILE=/opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/aarch64-linux- defconfig # make -s -j 10 ARCH=arm64 O=/kisskb/build/linus_arm64-defconfig_arm64-gcc5.4 CROSS_COMPILE=/opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/aarch64-linux- arch/arm64/Makefile:27: ld does not support --fix-cortex-a53-843419; kernel may be susceptible to erratum arch/arm64/Makefile:38: LSE atomics not supported by binutils arch/arm64/Makefile:62: CROSS_COMPILE_COMPAT not defined or empty, the compat vDSO will not be built /kisskb/src/drivers/i2c/busses/i2c-sh_mobile.c: In function 'sh_mobile_i2c_isr': /kisskb/src/drivers/i2c/busses/i2c-sh_mobile.c:399:26: warning: 'data' may be used uninitialized in this function [-Wmaybe-uninitialized] pd->msg->buf[real_pos] = data; ^ /kisskb/src/drivers/i2c/busses/i2c-sh_mobile.c:372:16: note: 'data' was declared here unsigned char data; ^ In file included from /kisskb/src/include/linux/rwsem.h:16:0, from /kisskb/src/include/linux/notifier.h:15, from /kisskb/src/include/linux/clk.h:14, from /kisskb/src/drivers/tty/serial/sh-sci.c:24: /kisskb/src/drivers/tty/serial/sh-sci.c: In function 'sci_dma_rx_submit': /kisskb/src/include/linux/spinlock.h:288:3: warning: 'flags' may be used uninitialized in this function [-Wmaybe-uninitialized] _raw_spin_unlock_irqrestore(lock, flags); \ ^ /kisskb/src/drivers/tty/serial/sh-sci.c:1351:16: note: 'flags' was declared here unsigned long flags; ^ Completed OK # rm -rf /kisskb/build/linus_arm64-defconfig_arm64-gcc5.4 # Build took: 0:09:41.112999