# 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/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 f60c55a94e1d127186566f06294f2dadd966e9b4 # < make -s -j 32 ARCH=sh O=/kisskb/build/linus_landisk_defconfig_sh4 CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux- landisk_defconfig # make -s -j 32 ARCH=sh O=/kisskb/build/linus_landisk_defconfig_sh4 CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h :1511:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/sh/kernel/cpu/sh4/../sh3/../../entry-common.S: Assembler messages: /kisskb/src/arch/sh/kernel/cpu/sh4/../sh3/../../entry-common.S:385: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh4/../sh3/../../entry-common.S:388: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/kernel/printk/printk.c: In function 'devkmsg_sysctl_set_loglvl': /kisskb/src/kernel/printk/printk.c:194:16: warning: 'old' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/proc/inode.c: In function 'proc_reg_open': /kisskb/src/include/linux/list.h:65:12: warning: 'pdeo' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/proc/inode.c:338:21: note: 'pdeo' was declared here /kisskb/src/drivers/net/tun.c: In function 'tun_get_user': /kisskb/src/drivers/net/tun.c:1836:30: warning: 'copylen' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/tun.c:1526:34: warning: 'linear' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/tun.c:1749:46: note: 'linear' was declared here /kisskb/src/drivers/sh/clk/cpg.c: In function 'r8': /kisskb/src/drivers/sh/clk/cpg.c:41:2: warning: passing argument 1 of 'ioread8' discards 'const' qualifier from pointer target type [enabled by default] /kisskb/src/include/asm-generic/iomap.h:29:21: note: expected 'void *' but argument is of type 'const void *' /kisskb/src/drivers/sh/clk/cpg.c: In function 'r16': /kisskb/src/drivers/sh/clk/cpg.c:46:2: warning: passing argument 1 of 'ioread16' discards 'const' qualifier from pointer target type [enabled by default] /kisskb/src/include/asm-generic/iomap.h:30:21: note: expected 'void *' but argument is of type 'const void *' /kisskb/src/drivers/sh/clk/cpg.c: In function 'r32': /kisskb/src/drivers/sh/clk/cpg.c:51:2: warning: passing argument 1 of 'ioread32' discards 'const' qualifier from pointer target type [enabled by default] /kisskb/src/include/asm-generic/iomap.h:32:21: note: expected 'void *' but argument is of type 'const void *' /kisskb/src/drivers/usb/core/devio.c: In function 'async_completed': /kisskb/src/drivers/usb/core/devio.c:625:23: warning: 'errno' may be used uninitialized in this function [-Wuninitialized] Kernel: arch/sh/boot/zImage is ready Completed OK # rm -rf /kisskb/build/linus_landisk_defconfig_sh4 # Build took: 0:00:47.014172