# git rev-parse -q --verify 0ee7c3e25d8c28845fceb4dd1c3cb5f50b9c45a9^{commit} 0ee7c3e25d8c28845fceb4dd1c3cb5f50b9c45a9 already have revision, skipping fetch # git checkout -q -f -B kisskb 0ee7c3e25d8c28845fceb4dd1c3cb5f50b9c45a9 # git clean -qxdf # < git log -1 # commit 0ee7c3e25d8c28845fceb4dd1c3cb5f50b9c45a9 # Merge: 916d636e0a2d 03b8df8d43ec # Author: Linus Torvalds # Date: Tue Aug 31 11:13:35 2021 -0700 # # Merge tag 'iomap-5.15-merge-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux # # Pull iomap updates from Darrick Wong: # "The most notable externally visible change for this cycle is the # addition of support for reads to inline tail fragments of files, which # was requested by the erofs developers; and a correction for a kernel # memory corruption bug if the sysadmin tries to activate a swapfile # with more pages than the swapfile header suggests. # # We also now report writeback completion errors to the file mapping # correctly, instead of munging all errors into EIO. # # Internally, the bulk of the changes are Christoph's patchset to reduce # the indirect function call count by a third to a half by converting # iomap iteration from a loop pattern to a generator/consumer pattern. # As an added bonus, fsdax no longer open-codes iomap apply loops. # # Summary: # # - Simplify the bio_end_page usage in the buffered IO code. # # - Support reading inline data at nonzero offsets for erofs. # # - Fix some typos and bad grammar. # # - Convert kmap_atomic usage in the inline data read path. # # - Add some extra inline data input checking. # # - Fix a memory corruption bug stemming from iomap_swapfile_activate # trying to activate more pages than mm was expecting. # # - Pass errnos through the page writeback code so that writeback # errors are reported correctly instead of being munged to EIO. # # - Replace iomap_apply with a open-coded iterator loops to reduce the # number of indirect calls by a third to a half. # # - Refactor the fsdax code to use iomap iterators instead of the # open-coded iomap_apply code that it had before. # # - Format file range iomap tracepoint data in hexadecimal and # standardize the names used in the pretty-print string" # # * tag 'iomap-5.15-merge-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: (41 commits) # iomap: standardize tracepoint formatting and storage # mm/swap: consider max pages in iomap_swapfile_add_extent # iomap: move loop control code to iter.c # iomap: constify iomap_iter_srcmap # fsdax: switch the fault handlers to use iomap_iter # fsdax: factor out a dax_fault_actor() helper # fsdax: factor out helpers to simplify the dax fault code # iomap: rework unshare flag # iomap: pass an iomap_iter to various buffered I/O helpers # iomap: remove iomap_apply # fsdax: switch dax_iomap_rw to use iomap_iter # iomap: switch iomap_swapfile_activate to use iomap_iter # iomap: switch iomap_seek_data to use iomap_iter # iomap: switch iomap_seek_hole to use iomap_iter # iomap: switch iomap_bmap to use iomap_iter # iomap: switch iomap_fiemap to use iomap_iter # iomap: switch __iomap_dio_rw to use iomap_iter # iomap: switch iomap_page_mkwrite to use iomap_iter # iomap: switch iomap_zero_range to use iomap_iter # iomap: switch iomap_file_unshare to use iomap_iter # ... # < /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 0ee7c3e25d8c28845fceb4dd1c3cb5f50b9c45a9 # < make -s -j 80 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- randconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_CPU_BIG_ENDIAN=y # Added to kconfig CONFIG_PPC64=y # Added to kconfig CONFIG_PPC_DISABLE_WERROR=y # Added to kconfig CONFIG_SECTION_MISMATCH_WARN_ONLY=y # Added to kconfig CONFIG_PREVENT_FIRMWARE_BUILD=y # Added to kconfig CONFIG_CC_STACKPROTECTOR_STRONG=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_LD_HEAD_STUB_CATCH=y # Added to kconfig CONFIG_TRIM_UNUSED_KSYMS=n # Added to kconfig CONFIG_UBSAN=n # < make -s -j 80 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 80 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig .config:4899:warning: override: reassigning to symbol STANDALONE .config:4904:warning: override: reassigning to symbol PPC_DISABLE_WERROR .config:4905:warning: override: reassigning to symbol SECTION_MISMATCH_WARN_ONLY .config:4911:warning: override: reassigning to symbol UBSAN # make -s -j 80 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/kernel/trace/trace_osnoise.c: In function 'start_kthread': /kisskb/src/kernel/trace/trace_osnoise.c:1515:8: warning: 'main' is usually a function [-Wmain] void *main = osnoise_main; ^ /kisskb/src/block/mq-deadline.c:274:12: warning: 'dd_queued' defined but not used [-Wunused-function] static u32 dd_queued(struct deadline_data *dd, enum dd_prio prio) ^ /kisskb/src/drivers/cxl/core.c: In function 'cxl_probe_component_regs': /kisskb/src/drivers/cxl/core.c:567:17: warning: missing braces around initializer [-Wmissing-braces] *map = (struct cxl_component_reg_map) { 0 }; ^ /kisskb/src/drivers/cxl/core.c:567:17: warning: (near initialization for '(anonymous).hdm_decoder') [-Wmissing-braces] /kisskb/src/drivers/cxl/core.c: In function 'cxl_probe_device_regs': /kisskb/src/drivers/cxl/core.c:831:17: warning: missing braces around initializer [-Wmissing-braces] *map = (struct cxl_device_reg_map){ 0 }; ^ /kisskb/src/drivers/cxl/core.c:831:17: warning: (near initialization for '(anonymous).status') [-Wmissing-braces] /kisskb/src/fs/btrfs/tree-checker.c: In function 'check_root_item': /kisskb/src/fs/btrfs/tree-checker.c:1089:9: warning: missing braces around initializer [-Wmissing-braces] struct btrfs_root_item ri = { 0 }; ^ /kisskb/src/fs/btrfs/tree-checker.c:1089:9: warning: (near initialization for 'ri.inode') [-Wmissing-braces] /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_psr.c: In function 'amdgpu_dm_psr_enable': /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_psr.c:104:9: warning: missing braces around initializer [-Wmissing-braces] struct dc_static_screen_params params = {0}; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_psr.c:104:9: warning: (near initialization for 'params.triggers') [-Wmissing-braces] /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/bios/bios_parser2.c: In function 'bios_parser_get_i2c_info': /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/bios/bios_parser2.c:297:9: warning: missing braces around initializer [-Wmissing-braces] struct atom_i2c_record dummy_record = {0}; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/bios/bios_parser2.c:297:9: warning: (near initialization for 'dummy_record.record_header') [-Wmissing-braces] /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dcn_calcs.c: In function 'dcn_bw_apply_registry_override': /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dcn_calcs.c:640:2: error: implicit declaration of function 'enable_kernel_altivec' [-Werror=implicit-function-declaration] DC_FP_START(); ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dcn_calcs.c:676:2: error: implicit declaration of function 'disable_kernel_altivec' [-Werror=implicit-function-declaration] DC_FP_END(); ^ cc1: some warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dcn_calcs.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/gpu/drm/amd/amdgpu] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/gpu/drm] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/gpu] Error 2 make[1]: *** [/kisskb/src/Makefile:1851: drivers] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:220: __sub-make] Error 2 Command 'make -s -j 80 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_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-rand_powerpc-randconfig_powerpc-gcc4.9 # Build took: 0:03:57.726162