# git rev-parse -q --verify 58f9d52ff689a262bec7f5713c07f5a79e115168^{commit} 58f9d52ff689a262bec7f5713c07f5a79e115168 already have revision, skipping fetch # git checkout -q -f -B kisskb 58f9d52ff689a262bec7f5713c07f5a79e115168 # git clean -qxdf # < git log -1 # commit 58f9d52ff689a262bec7f5713c07f5a79e115168 # Merge: 73503963b715 638696efc147 # Author: Linus Torvalds # Date: Thu Jun 2 12:50:16 2022 -0700 # # Merge tag 'net-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net # # Pull networking fixes from Jakub Kicinski: # "Including fixes from bpf and netfilter. # # Current release - new code bugs: # # - af_packet: make sure to pull the MAC header, avoid skb panic in GSO # # - ptp_clockmatrix: fix inverted logic in is_single_shot() # # - netfilter: flowtable: fix missing FLOWI_FLAG_ANYSRC flag # # - dt-bindings: net: adin: fix adi,phy-output-clock description syntax # # - wifi: iwlwifi: pcie: rename CAUSE macro, avoid MIPS build warning # # Previous releases - regressions: # # - Revert "net: af_key: add check for pfkey_broadcast in function # pfkey_process" # # - tcp: fix tcp_mtup_probe_success vs wrong snd_cwnd # # - nf_tables: disallow non-stateful expression in sets earlier # # - nft_limit: clone packet limits' cost value # # - nf_tables: double hook unregistration in netns path # # - ping6: fix ping -6 with interface name # # Previous releases - always broken: # # - sched: fix memory barriers to prevent skbs from getting stuck in # lockless qdiscs # # - neigh: set lower cap for neigh_managed_work rearming, avoid # constantly scheduling the probe work # # - bpf: fix probe read error on big endian in ___bpf_prog_run() # # - amt: memory leak and error handling fixes # # Misc: # # - ipv6: expand & rename accept_unsolicited_na to accept_untracked_na" # # * tag 'net-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (80 commits) # net/af_packet: make sure to pull mac header # net: add debug info to __skb_pull() # net: CONFIG_DEBUG_NET depends on CONFIG_NET # stmmac: intel: Add RPL-P PCI ID # net: stmmac: use dev_err_probe() for reporting mdio bus registration failure # tipc: check attribute length for bearer name # ice: fix access-beyond-end in the switch code # nfp: remove padding in nfp_nfdk_tx_desc # ax25: Fix ax25 session cleanup problems # net: usb: qmi_wwan: Add support for Cinterion MV31 with new baseline # sfc/siena: fix wrong tx channel offset with efx_separate_tx_channels # sfc/siena: fix considering that all channels have TX queues # socket: Don't use u8 type in uapi socket.h # net/sched: act_api: fix error code in tcf_ct_flow_table_fill_tuple_ipv6() # net: ping6: Fix ping -6 with interface name # macsec: fix UAF bug for real_dev # octeontx2-af: fix error code in is_valid_offset() # wifi: mac80211: fix use-after-free in chanctx code # bonding: guard ns_targets by CONFIG_IPV6 # tcp: tcp_rtx_synack() can be called from process context # ... # < /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 58f9d52ff689a262bec7f5713c07f5a79e115168 # < make -s -j 32 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 32 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 32 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:12342:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:12347:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:12349:warning: override: reassigning to symbol UML_NET_SLIP .config:12352:warning: override: reassigning to symbol UML_NET_MCAST .config:12354:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 32 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:271: drivers/nvdimm/pmem.o] Error 1 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.... 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 32 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:07:44.892184