# git rev-parse -q --verify 0adc313c4f20639f7e235b8d6719d96a2024cf91^{commit} 0adc313c4f20639f7e235b8d6719d96a2024cf91 already have revision, skipping fetch # git checkout -q -f -B kisskb 0adc313c4f20639f7e235b8d6719d96a2024cf91 # git clean -qxdf # < git log -1 # commit 0adc313c4f20639f7e235b8d6719d96a2024cf91 # Merge: 0613ed91901b bedb0f056faa # Author: Linus Torvalds # Date: Fri Oct 23 11:47:42 2020 -0700 # # Merge tag 'gfs2-for-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 # # Pull gfs2 updates from Andreas Gruenbacher: # # - Use iomap for non-journaled buffered I/O. This largely eliminates # buffer heads on filesystems where the block size matches the page # size. Many thanks to Christoph Hellwig for this patch! # # - Fixes for some more journaled data filesystem bugs, found by running # xfstests with data journaling on for all files (chattr +j $MNT) (Bob # Peterson) # # - gfs2_evict_inode refactoring (Bob Peterson) # # - Use the statfs data in the journal during recovery instead of reading # it in from the local statfs inodes (Abhi Das) # # - Several other minor fixes by various people # # * tag 'gfs2-for-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2: (30 commits) # gfs2: Recover statfs info in journal head # gfs2: lookup local statfs inodes prior to journal recovery # gfs2: Add fields for statfs info in struct gfs2_log_header_host # gfs2: Ignore subsequent errors after withdraw in rgrp_go_sync # gfs2: Eliminate gl_vm # gfs2: Only access gl_delete for iopen glocks # gfs2: Fix comments to glock_hash_walk # gfs2: eliminate GLF_QUEUED flag in favor of list_empty(gl_holders) # gfs2: Ignore journal log writes for jdata holes # gfs2: simplify gfs2_block_map # gfs2: Only set PageChecked if we have a transaction # gfs2: don't lock sd_ail_lock in gfs2_releasepage # gfs2: make gfs2_ail1_empty_one return the count of active items # gfs2: Wipe jdata and ail1 in gfs2_journal_wipe, formerly gfs2_meta_wipe # gfs2: enhance log_blocks trace point to show log blocks free # gfs2: add missing log_blocks trace points in gfs2_write_revokes # gfs2: rename gfs2_write_full_page to gfs2_write_jdata_page, remove parm # gfs2: add validation checks for size of superblock # gfs2: use-after-free in sysfs deregistration # gfs2: Fix NULL pointer dereference in gfs2_rgrp_dump # ... # < /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 0adc313c4f20639f7e235b8d6719d96a2024cf91 # < make -s -j 120 ARCH=powerpc O=/kisskb/build/linus_corenet32_smp_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- corenet32_smp_defconfig # make -s -j 120 ARCH=powerpc O=/kisskb/build/linus_corenet32_smp_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.30': /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[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1799: lib] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 120 ARCH=powerpc O=/kisskb/build/linus_corenet32_smp_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_corenet32_smp_defconfig_powerpc-gcc4.9 # Build took: 0:01:05.332787