# git rev-parse -q --verify 1d1df41c5a33359a00e919d54eaebfb789711fdc^{commit} 1d1df41c5a33359a00e919d54eaebfb789711fdc already have revision, skipping fetch # git checkout -q -f -B kisskb 1d1df41c5a33359a00e919d54eaebfb789711fdc # git clean -qxdf # < git log -1 # commit 1d1df41c5a33359a00e919d54eaebfb789711fdc # Merge: e9f5cbc0c851 5fed0be8583f # Author: Linus Torvalds # Date: Wed Jan 19 11:50:20 2022 +0200 # # Merge tag 'f2fs-for-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs # # Pull f2fs updates from Jaegeuk Kim: # "In this round, we've tried to address some performance issues in # f2fs_checkpoint and direct IO flows. Also, there was a work to enhance # the page cache management used for compression. Other than them, we've # done typical work including sysfs, code clean-ups, tracepoint, sanity # check, in addition to bug fixes on corner cases. # # Enhancements: # - use iomap for direct IO # - try to avoid lock contention to improve f2fs_ckpt speed # - avoid unnecessary memory allocation in compression flow # - POSIX_FADV_DONTNEED drops the page cache containing compression # pages # - add some sysfs entries (gc_urgent_high_remaining, pending_discard) # # Bug fixes: # - try not to expose unwritten blocks to user by DIO (this was added # to avoid merge conflict; another patch is coming to address other # missing case) # - relax minor error condition for file pinning feature used in # Android OTA # - fix potential deadlock case in compression flow # - should not truncate any block on pinned file # # In addition, we've done some code clean-ups and tracepoint/sanity # check improvement" # # * tag 'f2fs-for-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (29 commits) # f2fs: do not allow partial truncation on pinned file # f2fs: remove redunant invalidate compress pages # f2fs: Simplify bool conversion # f2fs: don't drop compressed page cache in .{invalidate,release}page # f2fs: fix to reserve space for IO align feature # f2fs: fix to check available space of CP area correctly in update_ckpt_flags() # f2fs: support fault injection to f2fs_trylock_op() # f2fs: clean up __find_inline_xattr() with __find_xattr() # f2fs: fix to do sanity check on last xattr entry in __f2fs_setxattr() # f2fs: do not bother checkpoint by f2fs_get_node_info # f2fs: avoid down_write on nat_tree_lock during checkpoint # f2fs: compress: fix potential deadlock of compress file # f2fs: avoid EINVAL by SBI_NEED_FSCK when pinning a file # f2fs: add gc_urgent_high_remaining sysfs node # f2fs: fix to do sanity check in is_alive() # f2fs: fix to avoid panic in is_alive() if metadata is inconsistent # f2fs: fix to do sanity check on inode type during garbage collection # f2fs: avoid duplicate call of mark_inode_dirty # f2fs: show number of pending discard commands # f2fs: support POSIX_FADV_DONTNEED drop compressed page cache # ... # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 1d1df41c5a33359a00e919d54eaebfb789711fdc # < make -s -j 48 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 allyesconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_KCOV=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_GCC_PLUGIN_CYC_COMPLEXITY=n # Added to kconfig CONFIG_GCC_PLUGIN_SANCOV=n # Added to kconfig CONFIG_GCC_PLUGIN_LATENT_ENTROPY=n # Added to kconfig CONFIG_GCC_PLUGIN_STRUCTLEAK=n # Added to kconfig CONFIG_GCC_PLUGIN_RANDSTRUCT=n # Added to kconfig CONFIG_UML_NET=n # Added to kconfig CONFIG_UML_NET_ETHERTAP=n # Added to kconfig CONFIG_UML_NET_TUNTAP=n # Added to kconfig CONFIG_UML_NET_SLIP=n # Added to kconfig CONFIG_UML_NET_DAEMON=n # Added to kconfig CONFIG_UML_NET_VDE=n # Added to kconfig CONFIG_UML_NET_MCAST=n # Added to kconfig CONFIG_UML_NET_PCAP=n # Added to kconfig CONFIG_UML_NET_SLIRP=n # Added to kconfig CONFIG_GCOV_KERNEL=n # Added to kconfig CONFIG_DEBUG_INFO_BTF=n # Added to kconfig CONFIG_BPF_PRELOAD=n # < make -s -j 48 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 48 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:12229:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:12232:warning: override: reassigning to symbol GCC_PLUGIN_RANDSTRUCT .config:12234:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:12236:warning: override: reassigning to symbol UML_NET_SLIP .config:12239:warning: override: reassigning to symbol UML_NET_MCAST .config:12241:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 48 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 /kisskb/src/kernel/sysctl.c:125:12: error: 'one_thousand' defined but not used [-Werror=unused-variable] static int one_thousand = 1000; ^ cc1: all warnings being treated as errors make[2]: *** [/kisskb/src/scripts/Makefile.build:288: kernel/sysctl.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1831: kernel] Error 2 make[1]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/vfio/pci/vfio_pci_rdwr.c: In function 'vfio_pci_vga_rw': /kisskb/src/drivers/vfio/pci/vfio_pci_rdwr.c:317:11: error: implicit declaration of function 'ioport_map' [-Werror=implicit-function-declaration] iomem = ioport_map(0x3b0, 0x3bb - 0x3b0 + 1); ^ /kisskb/src/drivers/vfio/pci/vfio_pci_rdwr.c:317:9: error: assignment makes pointer from integer without a cast [-Werror=int-conversion] iomem = ioport_map(0x3b0, 0x3bb - 0x3b0 + 1); ^ /kisskb/src/drivers/vfio/pci/vfio_pci_rdwr.c:324:9: error: assignment makes pointer from integer without a cast [-Werror=int-conversion] iomem = ioport_map(0x3c0, 0x3df - 0x3c0 + 1); ^ /kisskb/src/drivers/vfio/pci/vfio_pci_rdwr.c:338:15: error: implicit declaration of function 'ioport_unmap' [-Werror=implicit-function-declaration] is_ioport ? ioport_unmap(iomem) : iounmap(iomem); ^ cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:288: drivers/vfio/pci/vfio_pci_rdwr.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/vfio/pci] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/vfio] Error 2 make[2]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/arch/x86/um/asm/processor.h:41:0, from /kisskb/src/include/linux/mutex.h:19, from /kisskb/src/include/linux/kernfs.h:11, from /kisskb/src/include/linux/sysfs.h:16, from /kisskb/src/include/linux/kobject.h:20, from /kisskb/src/include/linux/pci.h:35, from /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:25: /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c: In function 'kfd_cpumask_to_apic_id': /kisskb/src/arch/um/include/asm/processor-generic.h:103:18: error: called object is not a function or function pointer #define cpu_data (&boot_cpu_data) ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:1556:9: note: in expansion of macro 'cpu_data' return cpu_data(first_cpu_of_numa_node).apicid; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:1560:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:288: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/gpu/drm/amd/amdgpu] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/gpu/drm] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/gpu] Error 2 make[1]: *** [/kisskb/src/Makefile:1831: drivers] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 48 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_um-allyesconfig_um-x86_64 # Build took: 0:10:35.903637