# git rev-parse -q --verify 96485e4462604744d66bf4301557d996d80b85eb^{commit} 96485e4462604744d66bf4301557d996d80b85eb already have revision, skipping fetch # git checkout -q -f -B kisskb 96485e4462604744d66bf4301557d996d80b85eb # git clean -qxdf # < git log -1 # commit 96485e4462604744d66bf4301557d996d80b85eb # Merge: f56e65dff6ad 1322181170bb # Author: Linus Torvalds # Date: Thu Oct 22 10:31:08 2020 -0700 # # Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 # # Pull ext4 updates from Ted Ts'o: # "The siginificant new ext4 feature this time around is Harshad's new # fast_commit mode. # # In addition, thanks to Mauricio for fixing a race where mmap'ed pages # that are being changed in parallel with a data=journal transaction # commit could result in bad checksums in the failure that could cause # journal replays to fail. # # Also notable is Ritesh's buffered write optimization which can result # in significant improvements on parallel write workloads. (The kernel # test robot reported a 330.6% improvement on fio.write_iops on a 96 # core system using DAX) # # Besides that, we have the usual miscellaneous cleanups and bug fixes" # # Link: https://lore.kernel.org/r/20200925071217.GO28663@shao2-debian # # * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (46 commits) # ext4: fix invalid inode checksum # ext4: add fast commit stats in procfs # ext4: add a mount opt to forcefully turn fast commits on # ext4: fast commit recovery path # jbd2: fast commit recovery path # ext4: main fast-commit commit path # jbd2: add fast commit machinery # ext4 / jbd2: add fast commit initialization # ext4: add fast_commit feature and handling for extended mount options # doc: update ext4 and journalling docs to include fast commit feature # ext4: Detect already used quota file early # jbd2: avoid transaction reuse after reformatting # ext4: use the normal helper to get the actual inode # ext4: fix bs < ps issue reported with dioread_nolock mount opt # ext4: data=journal: write-protect pages on j_submit_inode_data_buffers() # ext4: data=journal: fixes for ext4_page_mkwrite() # jbd2, ext4, ocfs2: introduce/use journal callbacks j_submit|finish_inode_data_buffers() # jbd2: introduce/export functions jbd2_journal_submit|finish_inode_data_buffers() # ext4: introduce ext4_sb_bread_unmovable() to replace sb_bread_unmovable() # ext4: use ext4_sb_bread() instead of sb_bread() # ... # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 96485e4462604744d66bf4301557d996d80b85eb # < make -s -j 48 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- mpc85xx_defconfig # < make -s -j 48 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 48 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 48 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- In file included from /kisskb/src/arch/powerpc/include/asm/cmpxchg.h:6:0, from /kisskb/src/arch/powerpc/include/asm/atomic.h:11, from /kisskb/src/include/linux/atomic.h:7, from /kisskb/src/include/linux/crypto.h:15, from /kisskb/src/include/crypto/hash.h:11, from /kisskb/src/lib/iov_iter.c:2: /kisskb/src/lib/iov_iter.c: In function 'iovec_from_user.part.32': /kisskb/src/arch/powerpc/include/asm/uaccess.h:246:2: error: 'asm' operand has impossible constraints __asm__ __volatile__( \ ^ /kisskb/src/include/linux/compiler.h:78:42: note: in definition of macro 'unlikely' # define unlikely(x) __builtin_expect(!!(x), 0) ^ /kisskb/src/arch/powerpc/include/asm/uaccess.h:542:34: note: in expansion of macro 'unsafe_op_wrap' #define unsafe_get_user(x, p, e) unsafe_op_wrap(__get_user_allowed(x, p), e) ^ /kisskb/src/arch/powerpc/include/asm/uaccess.h:288:10: note: in expansion of macro '__get_user_asm' case 4: __get_user_asm(x, (u32 __user *)ptr, retval, "lwz"); break; \ ^ /kisskb/src/arch/powerpc/include/asm/uaccess.h:322:3: note: in expansion of macro '__get_user_size_allowed' __get_user_size_allowed(__gu_val, __gu_addr, __gu_size, __gu_err); \ ^ /kisskb/src/arch/powerpc/include/asm/uaccess.h:59:2: note: in expansion of macro '__get_user_nocheck' __get_user_nocheck((x), (ptr), sizeof(*(ptr)), false) ^ /kisskb/src/arch/powerpc/include/asm/uaccess.h:542:49: note: in expansion of macro '__get_user_allowed' #define unsafe_get_user(x, p, e) unsafe_op_wrap(__get_user_allowed(x, p), e) ^ /kisskb/src/lib/iov_iter.c:1668:3: note: in expansion of macro 'unsafe_get_user' unsafe_get_user(len, &uiov[i].iov_len, uaccess_end); ^ make[2]: *** [/kisskb/src/scripts/Makefile.build:283: lib/iov_iter.o] Error 1 make[1]: *** [/kisskb/src/Makefile:1777: lib] Error 2 make[1]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/include/linux/kernel.h:11:0, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/module.h:12, from /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:15: /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c: In function 'allocate_bd': /kisskb/src/include/linux/err.h:22:49: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define IS_ERR_VALUE(x) unlikely((unsigned long)(void *)(x) >= (unsigned long)-MAX_ERRNO) ^ /kisskb/src/include/linux/compiler.h:78:42: note: in definition of macro 'unlikely' # define unlikely(x) __builtin_expect(!!(x), 0) ^ /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:139:6: note: in expansion of macro 'IS_ERR_VALUE' if (IS_ERR_VALUE(fep->ring_mem_addr)) ^ make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 48 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 # Build took: 0:01:47.018026