# git rev-parse -q --verify 037c50bfbeb33b4c74e120eef5b8b99d8f025418^{commit} 037c50bfbeb33b4c74e120eef5b8b99d8f025418 already have revision, skipping fetch # git checkout -q -f -B kisskb 037c50bfbeb33b4c74e120eef5b8b99d8f025418 # git clean -qxdf # < git log -1 # commit 037c50bfbeb33b4c74e120eef5b8b99d8f025418 # Merge: 2cf3f8133bda d1ed82f3559e # Author: Linus Torvalds # Date: Mon Nov 1 12:48:25 2021 -0700 # # Merge tag 'for-5.16-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux # # Pull btrfs updates from David Sterba: # "The updates this time are more under the hood and enhancing existing # features (subpage with compression and zoned namespaces). # # Performance related: # # - misc small inode logging improvements (+3% throughput, -11% latency # on sample dbench workload) # # - more efficient directory logging: bulk item insertion, less tree # searches and locking # # - speed up bulk insertion of items into a b-tree, which is used when # logging directories, when running delayed items for directories # (fsync and transaction commits) and when running the slow path # (full sync) of an fsync (bulk creation run time -4%, deletion -12%) # # Core: # # - continued subpage support # - make defragmentation work # - make compression write work # # - zoned mode # - support ZNS (zoned namespaces), zone capacity is number of # usable blocks in each zone # - add dedicated block group (zoned) for relocation, to prevent # out of order writes in some cases # - greedy block group reclaim, pick the ones with least usable # space first # # - preparatory work for send protocol updates # # - error handling improvements # # - cleanups and refactoring # # Fixes: # # - lockdep warnings # - in show_devname callback, on seeding device # - device delete on loop device due to conversions to workqueues # # - fix deadlock between chunk allocation and chunk btree modifications # # - fix tracking of missing device count and status" # # * tag 'for-5.16-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: (140 commits) # btrfs: remove root argument from check_item_in_log() # btrfs: remove root argument from add_link() # btrfs: remove root argument from btrfs_unlink_inode() # btrfs: remove root argument from drop_one_dir_item() # btrfs: clear MISSING device status bit in btrfs_close_one_device # btrfs: call btrfs_check_rw_degradable only if there is a missing device # btrfs: send: prepare for v2 protocol # btrfs: fix comment about sector sizes supported in 64K systems # btrfs: update device path inode time instead of bd_inode # fs: export an inode_update_time helper # btrfs: fix deadlock when defragging transparent huge pages # btrfs: sysfs: convert scnprintf and snprintf to sysfs_emit # btrfs: make btrfs_super_block size match BTRFS_SUPER_INFO_SIZE # btrfs: update comments for chunk allocation -ENOSPC cases # btrfs: fix deadlock between chunk allocation and chunk btree modifications # btrfs: zoned: use greedy gc for auto reclaim # btrfs: check-integrity: stop storing the block device name in btrfsic_dev_state # btrfs: use btrfs_get_dev_args_from_path in dev removal ioctls # btrfs: add a btrfs_get_dev_args_from_path helper # btrfs: handle device lookup with btrfs_dev_lookup_args # ... # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 037c50bfbeb33b4c74e120eef5b8b99d8f025418 # < make -s -j 32 ARCH=m68k O=/kisskb/build/linus_m68k-allmodconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # < make -s -j 32 ARCH=m68k O=/kisskb/build/linus_m68k-allmodconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 32 ARCH=m68k O=/kisskb/build/linus_m68k-allmodconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig # make -s -j 32 ARCH=m68k O=/kisskb/build/linus_m68k-allmodconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- In file included from /kisskb/src/include/linux/mmzone.h:22, from /kisskb/src/include/linux/topology.h:33, from /kisskb/src/include/linux/irq.h:19, from /kisskb/src/include/asm-generic/hardirq.h:17, from ./arch/m68k/include/generated/asm/hardirq.h:1, from /kisskb/src/include/linux/hardirq.h:11, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/kernel_stat.h:9, from /kisskb/src/arch/m68k/kernel/asm-offsets.c:16: /kisskb/src/include/linux/page-flags.h:806:29: error: macro "PAGEFLAG_FALSE" requires 2 arguments, but only 1 given 806 | PAGEFLAG_FALSE(HasHWPoisoned) | ^ /kisskb/src/include/linux/page-flags.h:411: note: macro "PAGEFLAG_FALSE" defined here 411 | #define PAGEFLAG_FALSE(uname, lname) TESTPAGEFLAG_FALSE(uname, lname) \ | /kisskb/src/include/linux/page-flags.h:807:39: error: macro "TESTSCFLAG_FALSE" requires 2 arguments, but only 1 given 807 | TESTSCFLAG_FALSE(HasHWPoisoned) | ^ /kisskb/src/include/linux/page-flags.h:414: note: macro "TESTSCFLAG_FALSE" defined here 414 | #define TESTSCFLAG_FALSE(uname, lname) \ | /kisskb/src/include/linux/page-flags.h:806:1: error: unknown type name 'PAGEFLAG_FALSE' 806 | PAGEFLAG_FALSE(HasHWPoisoned) | ^~~~~~~~~~~~~~ /kisskb/src/include/linux/page-flags.h:807:25: error: expected ';' before 'static' 807 | TESTSCFLAG_FALSE(HasHWPoisoned) | ^ | ; ...... 815 | static inline bool is_page_hwpoison(struct page *page) | ~~~~~~ make[2]: *** [/kisskb/src/scripts/Makefile.build:121: arch/m68k/kernel/asm-offsets.s] Error 1 make[1]: *** [/kisskb/src/Makefile:1220: prepare0] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 32 ARCH=m68k O=/kisskb/build/linus_m68k-allmodconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_m68k-allmodconfig_m68k-gcc11 # Build took: 0:00:11.496856