# git rev-parse -q --verify 17d8e3d90b6989419806c1926b894d7d7483a25b^{commit} 17d8e3d90b6989419806c1926b894d7d7483a25b already have revision, skipping fetch # git checkout -q -f -B kisskb 17d8e3d90b6989419806c1926b894d7d7483a25b # git clean -qxdf # < git log -1 # commit 17d8e3d90b6989419806c1926b894d7d7483a25b # Merge: 7c9e960c6363 af7dc8e5124d # Author: Linus Torvalds # Date: Thu Jun 2 08:59:39 2022 -0700 # # Merge tag 'ceph-for-5.19-rc1' of https://github.com/ceph/ceph-client # # Pull ceph updates from Ilya Dryomov: # "A big pile of assorted fixes and improvements for the filesystem with # nothing in particular standing out, except perhaps that the fact that # the MDS never really maintained atime was made official and thus it's # no longer updated on the client either. # # We also have a MAINTAINERS update: Jeff is transitioning his # filesystem maintainership duties to Xiubo" # # * tag 'ceph-for-5.19-rc1' of https://github.com/ceph/ceph-client: (23 commits) # MAINTAINERS: move myself from ceph "Maintainer" to "Reviewer" # ceph: fix decoding of client session messages flags # ceph: switch TASK_INTERRUPTIBLE to TASK_KILLABLE # ceph: remove redundant variable ino # ceph: try to queue a writeback if revoking fails # ceph: fix statfs for subdir mounts # ceph: fix possible deadlock when holding Fwb to get inline_data # ceph: redirty the page for writepage on failure # ceph: try to choose the auth MDS if possible for getattr # ceph: disable updating the atime since cephfs won't maintain it # ceph: flush the mdlog for filesystem sync # ceph: rename unsafe_request_wait() # libceph: use swap() macro instead of taking tmp variable # ceph: fix statx AT_STATX_DONT_SYNC vs AT_STATX_FORCE_SYNC check # ceph: no need to invalidate the fscache twice # ceph: replace usage of found with dedicated list iterator variable # ceph: use dedicated list iterator variable # ceph: update the dlease for the hashed dentry when removing # ceph: stop retrying the request when exceeding 256 times # ceph: stop forwarding the request when exceeding 256 times # ... # < /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 17d8e3d90b6989419806c1926b894d7d7483a25b # < make -s -j 120 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 120 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 120 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:12564:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:12569:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:12571:warning: override: reassigning to symbol UML_NET_SLIP .config:12574:warning: override: reassigning to symbol UML_NET_MCAST .config:12576:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 120 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/drivers/nvdimm/pmem.c:48:20: error: conflicting types for 'to_phys' static phys_addr_t to_phys(struct pmem_device *pmem, phys_addr_t offset) ^ In file included from /kisskb/src/arch/um/include/asm/page.h:98:0, from /kisskb/src/arch/um/include/asm/thread_info.h:15, from /kisskb/src/include/linux/thread_info.h:60, from /kisskb/src/include/asm-generic/preempt.h:5, from ./arch/um/include/generated/asm/preempt.h:1, from /kisskb/src/include/linux/preempt.h:78, from /kisskb/src/include/linux/spinlock.h:55, from /kisskb/src/include/linux/wait.h:9, from /kisskb/src/include/linux/wait_bit.h:8, from /kisskb/src/include/linux/fs.h:6, from /kisskb/src/include/linux/highmem.h:5, from /kisskb/src/include/linux/bvec.h:10, from /kisskb/src/include/linux/blk_types.h:10, from /kisskb/src/include/linux/blkdev.h:9, from /kisskb/src/drivers/nvdimm/pmem.c:10: /kisskb/src/arch/um/include/shared/mem.h:12:29: note: previous definition of 'to_phys' was here static inline unsigned long to_phys(void *virt) ^ In file included from /kisskb/src/arch/um/include/asm/page.h:114:0, from /kisskb/src/arch/um/include/asm/thread_info.h:15, from /kisskb/src/include/linux/thread_info.h:60, from /kisskb/src/include/asm-generic/preempt.h:5, from ./arch/um/include/generated/asm/preempt.h:1, from /kisskb/src/include/linux/preempt.h:78, from /kisskb/src/include/linux/spinlock.h:55, from /kisskb/src/include/linux/wait.h:9, from /kisskb/src/include/linux/wait_bit.h:8, from /kisskb/src/include/linux/fs.h:6, from /kisskb/src/include/linux/highmem.h:5, from /kisskb/src/include/linux/bvec.h:10, from /kisskb/src/include/linux/blk_types.h:10, from /kisskb/src/include/linux/blkdev.h:9, from /kisskb/src/drivers/nvdimm/pmem.c:10: /kisskb/src/drivers/nvdimm/pmem.c: In function 'pmem_dax_zero_page_range': /kisskb/src/arch/um/include/asm/page.h:105:20: error: too few arguments to function 'to_phys' #define __pa(virt) to_phys((void *) (unsigned long) (virt)) ^ /kisskb/src/include/asm-generic/memory_model.h:18:41: note: in definition of macro '__pfn_to_page' #define __pfn_to_page(pfn) (mem_map + ((pfn) - ARCH_PFN_OFFSET)) ^ /kisskb/src/arch/um/include/asm/pgtable.h:276:40: note: in expansion of macro 'phys_to_pfn' #define phys_to_page(phys) pfn_to_page(phys_to_pfn(phys)) ^ /kisskb/src/arch/um/include/asm/pgtable.h:277:30: note: in expansion of macro 'phys_to_page' #define __virt_to_page(virt) phys_to_page(__pa(virt)) ^ /kisskb/src/arch/um/include/asm/pgtable.h:277:43: note: in expansion of macro '__pa' #define __virt_to_page(virt) phys_to_page(__pa(virt)) ^ /kisskb/src/arch/um/include/asm/pgtable.h:279:28: note: in expansion of macro '__virt_to_page' #define virt_to_page(addr) __virt_to_page((const unsigned long) addr) ^ /kisskb/src/arch/um/include/asm/pgtable.h:93:26: note: in expansion of macro 'virt_to_page' #define ZERO_PAGE(vaddr) virt_to_page(empty_zero_page) ^ /kisskb/src/drivers/nvdimm/pmem.c:321:49: note: in expansion of macro 'ZERO_PAGE' return blk_status_to_errno(pmem_do_write(pmem, ZERO_PAGE(0), 0, ^ /kisskb/src/drivers/nvdimm/pmem.c:48:20: note: declared here static phys_addr_t to_phys(struct pmem_device *pmem, phys_addr_t offset) ^ /kisskb/src/drivers/nvdimm/pmem.c:324:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[3]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/nvdimm/pmem.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/nvdimm] 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:26: /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:1620: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:1624: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:271: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.o] Error 1 make[5]: *** 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_crat.c:24: /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_crat.c: In function 'kfd_fill_iolink_info_for_cpu': /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_crat.c:1775:27: note: in expansion of macro 'cpu_data' struct cpuinfo_x86 *c = &cpu_data(0); ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_crat.c:1778:7: error: dereferencing pointer to incomplete type 'struct cpuinfo_x86' if (c->x86_vendor == X86_VENDOR_AMD) ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_crat.c:1778:23: error: 'X86_VENDOR_AMD' undeclared (first use in this function) if (c->x86_vendor == X86_VENDOR_AMD) ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_crat.c:1778:23: note: each undeclared identifier is reported only once for each function it appears in make[5]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_crat.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/gpu/drm/amd/amdgpu] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/gpu/drm] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/gpu] Error 2 make[1]: *** [/kisskb/src/Makefile:1839: drivers] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 120 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:02:13.281105