# git rev-parse -q --verify 48a23ec6ff2b2a5effe8d3ae5f17fc6b7f35df65^{commit} 48a23ec6ff2b2a5effe8d3ae5f17fc6b7f35df65 already have revision, skipping fetch # git checkout -q -f -B kisskb 48a23ec6ff2b2a5effe8d3ae5f17fc6b7f35df65 # git clean -qxdf # < git log -1 # commit 48a23ec6ff2b2a5effe8d3ae5f17fc6b7f35df65 # Merge: 30306f6194ca 2e7bf4a6af48 # Author: Linus Torvalds # Date: Thu Jun 16 11:51:32 2022 -0700 # # Merge tag 'net-5.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net # # Pull networking fixes from Jakub Kicinski: # "Mostly driver fixes. # # Current release - regressions: # # - Revert "net: Add a second bind table hashed by port and address", # needs more work # # - amd-xgbe: use platform_irq_count(), static setup of IRQ resources # had been removed from DT core # # - dts: at91: ksz9477_evb: add phy-mode to fix port/phy validation # # Current release - new code bugs: # # - hns3: modify the ring param print info # # Previous releases - always broken: # # - axienet: make the 64b addressable DMA depends on 64b architectures # # - iavf: fix issue with MAC address of VF shown as zero # # - ice: fix PTP TX timestamp offset calculation # # - usb: ax88179_178a needs FLAG_SEND_ZLP # # Misc: # # - document some net.sctp.* sysctls" # # * tag 'net-5.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (31 commits) # net: axienet: add missing error return code in axienet_probe() # Revert "net: Add a second bind table hashed by port and address" # net: ax25: Fix deadlock caused by skb_recv_datagram in ax25_recvmsg # net: usb: ax88179_178a needs FLAG_SEND_ZLP # MAINTAINERS: add include/dt-bindings/net to NETWORKING DRIVERS # ARM: dts: at91: ksz9477_evb: fix port/phy validation # net: bgmac: Fix an erroneous kfree() in bgmac_remove() # ice: Fix memory corruption in VF driver # ice: Fix queue config fail handling # ice: Sync VLAN filtering features for DVM # ice: Fix PTP TX timestamp offset calculation # mlxsw: spectrum_cnt: Reorder counter pools # docs: networking: phy: Fix a typo # amd-xgbe: Use platform_irq_count() # octeontx2-vf: Add support for adaptive interrupt coalescing # xilinx: Fix build on x86. # net: axienet: Use iowrite64 to write all 64b descriptor pointers # net: axienet: make the 64b addresable DMA depends on 64b archectures # net: hns3: fix tm port shapping of fibre port is incorrect after driver initialization # net: hns3: fix PF rss size initialization bug # ... # < /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 48a23ec6ff2b2a5effe8d3ae5f17fc6b7f35df65 # < make -s -j 24 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 allmodconfig # 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 24 ARCH=um O=/kisskb/build/linus_um-allmodconfig_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 24 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:12354:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:12359:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:12361:warning: override: reassigning to symbol UML_NET_SLIP .config:12364:warning: override: reassigning to symbol UML_NET_MCAST .config:12366:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 24 ARCH=um O=/kisskb/build/linus_um-allmodconfig_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:249: drivers/nvdimm/pmem.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:466: 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:1610: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:1614: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:249: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:466: drivers/gpu/drm/amd/amdgpu] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:466: drivers/gpu/drm] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:466: drivers/gpu] Error 2 make[1]: *** [/kisskb/src/Makefile:1843: drivers] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 24 ARCH=um O=/kisskb/build/linus_um-allmodconfig_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-allmodconfig_um-x86_64 # Build took: 0:17:30.739356