# git rev-parse -q --verify 337a0a0b63f1c30195733eaacf39e4310a592a68^{commit} 337a0a0b63f1c30195733eaacf39e4310a592a68 already have revision, skipping fetch # git checkout -q -f -B kisskb 337a0a0b63f1c30195733eaacf39e4310a592a68 # git clean -qxdf # < git log -1 # commit 337a0a0b63f1c30195733eaacf39e4310a592a68 # Merge: f6602a97a11a 720ca52bcef2 # Author: Linus Torvalds # Date: Mon Oct 24 12:43:51 2022 -0700 # # Merge tag 'net-6.1-rc3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net # # Pull networking fixes from Jakub Kicinski: # "Including fixes from bpf. # # The net-memcg fix stands out, the rest is very run-off-the-mill. Maybe # I'm biased. # # Current release - regressions: # # - eth: fman: re-expose location of the MAC address to userspace, # apparently some udev scripts depended on the exact value # # Current release - new code bugs: # # - bpf: # - wait for busy refill_work when destroying bpf memory allocator # - allow bpf_user_ringbuf_drain() callbacks to return 1 # - fix dispatcher patchable function entry to 5 bytes nop # # Previous releases - regressions: # # - net-memcg: avoid stalls when under memory pressure # # - tcp: fix indefinite deferral of RTO with SACK reneging # # - tipc: fix a null-ptr-deref in tipc_topsrv_accept # # - eth: macb: specify PHY PM management done by MAC # # - tcp: fix a signed-integer-overflow bug in tcp_add_backlog() # # Previous releases - always broken: # # - eth: amd-xgbe: SFP fixes and compatibility improvements # # Misc: # # - docs: netdev: offer performance feedback to contributors" # # * tag 'net-6.1-rc3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (37 commits) # net-memcg: avoid stalls when under memory pressure # tcp: fix indefinite deferral of RTO with SACK reneging # tcp: fix a signed-integer-overflow bug in tcp_add_backlog() # net: lantiq_etop: don't free skb when returning NETDEV_TX_BUSY # net: fix UAF issue in nfqnl_nf_hook_drop() when ops_init() failed # docs: netdev: offer performance feedback to contributors # kcm: annotate data-races around kcm->rx_wait # kcm: annotate data-races around kcm->rx_psock # net: fman: Use physical address for userspace interfaces # net/mlx5e: Cleanup MACsec uninitialization routine # atlantic: fix deadlock at aq_nic_stop # nfp: only clean `sp_indiff` when application firmware is unloaded # amd-xgbe: add the bit rate quirk for Molex cables # amd-xgbe: fix the SFP compliance codes check for DAC cables # amd-xgbe: enable PLL_CTL for fixed PHY modes only # amd-xgbe: use enums for mailbox cmd and sub_cmds # amd-xgbe: Yellow carp devices do not need rrc # bpf: Use __llist_del_all() whenever possbile during memory draining # bpf: Wait for busy refill_work when destroying bpf memory allocator # MAINTAINERS: add keyword match on PTP # ... # < /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 337a0a0b63f1c30195733eaacf39e4310a592a68 # < make -s -j 32 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 32 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 32 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:12782:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:12787:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:12789:warning: override: reassigning to symbol UML_NET_SLIP .config:12792:warning: override: reassigning to symbol UML_NET_MCAST .config:12794:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 32 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/arch/um/os-Linux/util.c:17:24: fatal error: sys/random.h: No such file or directory compilation terminated. make[3]: *** [/kisskb/src/scripts/Makefile.build:250: arch/um/os-Linux/util.o] Error 1 make[2]: *** [/kisskb/src/scripts/Makefile.build:500: arch/um/os-Linux] 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:94: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:1930: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:1934:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[6]: *** [/kisskb/src/scripts/Makefile.build:250: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.o] Error 1 make[6]: *** Waiting for unfinished jobs.... make[5]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/gpu/drm/amd/amdgpu] Error 2 make[5]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/infiniband/hw/qib/qib_wc_x86_64.c: In function 'qib_unordered_wc': /kisskb/src/drivers/infiniband/hw/qib/qib_wc_x86_64.c:149:22: error: 'struct cpuinfo_um' has no member named 'x86_vendor' return boot_cpu_data.x86_vendor != X86_VENDOR_AMD; ^ /kisskb/src/drivers/infiniband/hw/qib/qib_wc_x86_64.c:149:37: error: 'X86_VENDOR_AMD' undeclared (first use in this function) return boot_cpu_data.x86_vendor != X86_VENDOR_AMD; ^ /kisskb/src/drivers/infiniband/hw/qib/qib_wc_x86_64.c:149:37: note: each undeclared identifier is reported only once for each function it appears in /kisskb/src/drivers/infiniband/hw/qib/qib_wc_x86_64.c:150:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[6]: *** [/kisskb/src/scripts/Makefile.build:250: drivers/infiniband/hw/qib/qib_wc_x86_64.o] Error 1 make[5]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/infiniband/hw/qib] Error 2 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/infiniband/hw] Error 2 make[4]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/infiniband/sw/rdmavt/qp.c: In function 'rvt_wss_llc_size': /kisskb/src/drivers/infiniband/sw/rdmavt/qp.c:88:22: error: 'struct cpuinfo_um' has no member named 'x86_cache_size' return boot_cpu_data.x86_cache_size; ^ /kisskb/src/drivers/infiniband/sw/rdmavt/qp.c: In function 'cacheless_memcpy': /kisskb/src/drivers/infiniband/sw/rdmavt/qp.c:100:2: error: implicit declaration of function '__copy_user_nocache' [-Werror=implicit-function-declaration] __copy_user_nocache(dst, (void __user *)src, n, 0); ^ /kisskb/src/drivers/infiniband/sw/rdmavt/qp.c: In function 'rvt_wss_llc_size': /kisskb/src/drivers/infiniband/sw/rdmavt/qp.c:89:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[6]: *** [/kisskb/src/scripts/Makefile.build:250: drivers/infiniband/sw/rdmavt/qp.o] Error 1 make[6]: *** Waiting for unfinished jobs.... make[5]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/infiniband/sw/rdmavt] Error 2 make[4]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/infiniband/sw] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/infiniband] Error 2 make[3]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/gpu/drm] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/gpu] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:500: drivers] Error 2 make[1]: *** [/kisskb/src/Makefile:1992: .] Error 2 make: *** [Makefile:231: __sub-make] Error 2 Command 'make -s -j 32 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:24:50.726458