# 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/s390-linux/bin/s390-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/s390-linux/bin/s390-linux-ld --version # < git log --format=%s --max-count=1 f60c55a94e1d127186566f06294f2dadd966e9b4 # < make -s -j 8 ARCH=s390 O=/kisskb/build/linus_s390-allmodconfig_s390x-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/s390-linux/bin/s390-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # yes \n | make -s -j 8 ARCH=s390 O=/kisskb/build/linus_s390-allmodconfig_s390x-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/s390-linux/bin/s390-linux- oldconfig yes: standard output: Broken pipe # make -s -j 8 ARCH=s390 O=/kisskb/build/linus_s390-allmodconfig_s390x-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/s390-linux/bin/s390-linux- In file included from /kisskb/src/include/linux/kernel.h:15, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/wait.h:7, from /kisskb/src/include/linux/wait_bit.h:8, from /kisskb/src/include/linux/fs.h:6, from /kisskb/src/fs/ubifs/ubifs.h:16, from /kisskb/src/fs/ubifs/orphan.c:10: /kisskb/src/fs/ubifs/orphan.c: In function 'orphan_delete': /kisskb/src/fs/ubifs/debug.h:158:11: warning: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'ino_t' {aka 'unsigned int'} [-Wformat=] pr_debug("UBIFS DBG " type " (pid %d): " fmt "\n", current->pid, \ ^~~~~~~~~~~~ /kisskb/src/include/linux/printk.h:288:21: note: in definition of macro 'pr_fmt' #define pr_fmt(fmt) fmt ^~~ /kisskb/src/include/linux/dynamic_debug.h:143:2: note: in expansion of macro '__dynamic_func_call' __dynamic_func_call(__UNIQUE_ID(ddebug), fmt, func, ##__VA_ARGS__) ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/dynamic_debug.h:153:2: note: in expansion of macro '_dynamic_func_call' _dynamic_func_call(fmt, __dynamic_pr_debug, \ ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/printk.h:336:2: note: in expansion of macro 'dynamic_pr_debug' dynamic_pr_debug(fmt, ##__VA_ARGS__) ^~~~~~~~~~~~~~~~ /kisskb/src/fs/ubifs/debug.h:158:2: note: in expansion of macro 'pr_debug' pr_debug("UBIFS DBG " type " (pid %d): " fmt "\n", current->pid, \ ^~~~~~~~ /kisskb/src/fs/ubifs/debug.h:170:29: note: in expansion of macro 'ubifs_dbg_msg' #define dbg_gen(fmt, ...) ubifs_dbg_msg("gen", fmt, ##__VA_ARGS__) ^~~~~~~~~~~~~ /kisskb/src/fs/ubifs/orphan.c:132:3: note: in expansion of macro 'dbg_gen' dbg_gen("deleted twice ino %lu", orph->inum); ^~~~~~~ /kisskb/src/fs/ubifs/orphan.c:132:32: note: format string is defined here dbg_gen("deleted twice ino %lu", orph->inum); ~~^ %u In file included from /kisskb/src/include/linux/kernel.h:15, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/wait.h:7, from /kisskb/src/include/linux/wait_bit.h:8, from /kisskb/src/include/linux/fs.h:6, from /kisskb/src/fs/ubifs/ubifs.h:16, from /kisskb/src/fs/ubifs/orphan.c:10: /kisskb/src/fs/ubifs/debug.h:158:11: warning: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'ino_t' {aka 'unsigned int'} [-Wformat=] pr_debug("UBIFS DBG " type " (pid %d): " fmt "\n", current->pid, \ ^~~~~~~~~~~~ /kisskb/src/include/linux/printk.h:288:21: note: in definition of macro 'pr_fmt' #define pr_fmt(fmt) fmt ^~~ /kisskb/src/include/linux/dynamic_debug.h:143:2: note: in expansion of macro '__dynamic_func_call' __dynamic_func_call(__UNIQUE_ID(ddebug), fmt, func, ##__VA_ARGS__) ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/dynamic_debug.h:153:2: note: in expansion of macro '_dynamic_func_call' _dynamic_func_call(fmt, __dynamic_pr_debug, \ ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/printk.h:336:2: note: in expansion of macro 'dynamic_pr_debug' dynamic_pr_debug(fmt, ##__VA_ARGS__) ^~~~~~~~~~~~~~~~ /kisskb/src/fs/ubifs/debug.h:158:2: note: in expansion of macro 'pr_debug' pr_debug("UBIFS DBG " type " (pid %d): " fmt "\n", current->pid, \ ^~~~~~~~ /kisskb/src/fs/ubifs/debug.h:170:29: note: in expansion of macro 'ubifs_dbg_msg' #define dbg_gen(fmt, ...) ubifs_dbg_msg("gen", fmt, ##__VA_ARGS__) ^~~~~~~~~~~~~ /kisskb/src/fs/ubifs/orphan.c:140:3: note: in expansion of macro 'dbg_gen' dbg_gen("delete later ino %lu", orph->inum); ^~~~~~~ /kisskb/src/fs/ubifs/orphan.c:140:31: note: format string is defined here dbg_gen("delete later ino %lu", orph->inum); ~~^ %u /kisskb/src/lib/test_kasan.c: In function 'kasan_alloca_oob_left': /kisskb/src/lib/test_kasan.c:488:1: warning: 'kasan_alloca_oob_left' uses dynamic stack allocation } ^ /kisskb/src/lib/test_kasan.c: In function 'kasan_alloca_oob_right': /kisskb/src/lib/test_kasan.c:498:1: warning: 'kasan_alloca_oob_right' uses dynamic stack allocation } ^ /kisskb/src/drivers/input/joystick/analog.c:160:2: warning: #warning Precise timer not defined for this architecture. [-Wcpp] #warning Precise timer not defined for this architecture. ^~~~~~~ In file included from /kisskb/src/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c:40: /kisskb/src/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c: In function 'mvpp2_setup_bm_pool': /kisskb/src/drivers/net/ethernet/marvell/mvpp2/mvpp2.h:634:2: warning: overflow in conversion from 'long unsigned int' to 'int' changes value from '18446744073709551584' to '-32' [-Woverflow] ((total_size) - NET_SKB_PAD - MVPP2_SKB_SHINFO_SIZE) ^ /kisskb/src/drivers/net/ethernet/marvell/mvpp2/mvpp2.h:699:33: note: in expansion of macro 'MVPP2_RX_MAX_PKT_SIZE' #define MVPP2_BM_SHORT_PKT_SIZE MVPP2_RX_MAX_PKT_SIZE(MVPP2_BM_SHORT_FRAME_SIZE) ^~~~~~~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c:577:41: note: in expansion of macro 'MVPP2_BM_SHORT_PKT_SIZE' mvpp2_pools[MVPP2_BM_SHORT].pkt_size = MVPP2_BM_SHORT_PKT_SIZE; ^~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/drivers/soundwire/slave.c:16:12: warning: 'sdw_slave_add' defined but not used [-Wunused-function] static int sdw_slave_add(struct sdw_bus *bus, ^~~~~~~~~~~~~ Completed OK # rm -rf /kisskb/build/linus_s390-allmodconfig_s390x-gcc8 # Build took: 0:28:38.910568