# git rev-parse -q --verify 902e7f373fff2476b53824264c12e4e76c7ec02a^{commit} 902e7f373fff2476b53824264c12e4e76c7ec02a already have revision, skipping fetch # git checkout -q -f -B kisskb 902e7f373fff2476b53824264c12e4e76c7ec02a # git clean -qxdf # < git log -1 # commit 902e7f373fff2476b53824264c12e4e76c7ec02a # Merge: e04480920d1e 6bb5318ce501 # Author: Linus Torvalds # Date: Thu Aug 5 12:26:00 2021 -0700 # # Merge tag 'net-5.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net # # Pull networking fixes from Jakub Kicinski: # "Including fixes from ipsec. # # Current release - regressions: # # - sched: taprio: fix init procedure to avoid inf loop when dumping # # - sctp: move the active_key update after sh_keys is added # # Current release - new code bugs: # # - sparx5: fix build with old GCC & bitmask on 32-bit targets # # Previous releases - regressions: # # - xfrm: redo the PREEMPT_RT RCU vs hash_resize_mutex deadlock fix # # - xfrm: fixes for the compat netlink attribute translator # # - phy: micrel: Fix detection of ksz87xx switch # # Previous releases - always broken: # # - gro: set inner transport header offset in tcp/udp GRO hook to avoid # crashes when such packets reach GSO # # - vsock: handle VIRTIO_VSOCK_OP_CREDIT_REQUEST, as required by spec # # - dsa: sja1105: fix static FDB entries on SJA1105P/Q/R/S and SJA1110 # # - bridge: validate the NUD_PERMANENT bit when adding an extern_learn # FDB entry # # - usb: lan78xx: don't modify phy_device state concurrently # # - usb: pegasus: check for errors of IO routines" # # * tag 'net-5.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (48 commits) # net: vxge: fix use-after-free in vxge_device_unregister # net: fec: fix use-after-free in fec_drv_remove # net: pegasus: fix uninit-value in get_interrupt_interval # net: ethernet: ti: am65-cpsw: fix crash in am65_cpsw_port_offload_fwd_mark_update() # bnx2x: fix an error code in bnx2x_nic_load() # net: wwan: iosm: fix recursive lock acquire in unregister # net: wwan: iosm: correct data protocol mask bit # net: wwan: iosm: endianness type correction # net: wwan: iosm: fix lkp buildbot warning # net: usb: lan78xx: don't modify phy_device state concurrently # docs: networking: netdevsim rules # net: usb: pegasus: Remove the changelog and DRIVER_VERSION. # net: usb: pegasus: Check the return value of get_geristers() and friends; # net/prestera: Fix devlink groups leakage in error flow # net: sched: fix lockdep_set_class() typo error for sch->seqlock # net: dsa: qca: ar9331: reorder MDIO write sequence # VSOCK: handle VIRTIO_VSOCK_OP_CREDIT_REQUEST # mptcp: drop unused rcu member in mptcp_pm_addr_entry # net: ipv6: fix returned variable type in ip6_skb_dst_mtu # nfp: update ethtool reporting of pauseframe control # ... # < /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 902e7f373fff2476b53824264c12e4e76c7ec02a # < make -s -j 48 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 48 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 48 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:11595:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:11598:warning: override: reassigning to symbol GCC_PLUGIN_RANDSTRUCT .config:11600:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:11602:warning: override: reassigning to symbol UML_NET_SLIP .config:11605:warning: override: reassigning to symbol UML_NET_MCAST .config:11607:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 48 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/kernel/trace/trace_osnoise.c: In function 'start_kthread': /kisskb/src/kernel/trace/trace_osnoise.c:1461:8: warning: 'main' is usually a function [-Wmain] void *main = osnoise_main; ^ /kisskb/src/drivers/pci/controller/vmd.c:116:21: error: field 'sysdata' has incomplete type struct pci_sysdata sysdata; ^ /kisskb/src/drivers/pci/controller/vmd.c: In function 'vmd_compose_msi_msg': /kisskb/src/drivers/pci/controller/vmd.c:150:20: error: 'X86_MSI_BASE_ADDRESS_HIGH' undeclared (first use in this function) msg->address_hi = X86_MSI_BASE_ADDRESS_HIGH; ^ /kisskb/src/drivers/pci/controller/vmd.c:150:20: note: each undeclared identifier is reported only once for each function it appears in /kisskb/src/drivers/pci/controller/vmd.c:151:19: error: 'arch_msi_msg_addr_lo_t {aka struct arch_msi_msg_addr_lo}' has no member named 'base_address' msg->arch_addr_lo.base_address = X86_MSI_BASE_ADDRESS_LOW; ^ /kisskb/src/drivers/pci/controller/vmd.c:151:35: error: 'X86_MSI_BASE_ADDRESS_LOW' undeclared (first use in this function) msg->arch_addr_lo.base_address = X86_MSI_BASE_ADDRESS_LOW; ^ /kisskb/src/drivers/pci/controller/vmd.c:152:19: error: 'arch_msi_msg_addr_lo_t {aka struct arch_msi_msg_addr_lo}' has no member named 'destid_0_7' msg->arch_addr_lo.destid_0_7 = index_from_irqs(vmd, irq); ^ /kisskb/src/drivers/pci/controller/vmd.c: In function 'vmd_enable_domain': /kisskb/src/drivers/pci/controller/vmd.c:700:4: error: dereferencing pointer to incomplete type 'struct pci_sysdata' sd->vmd_dev = vmd->dev; ^ /kisskb/src/drivers/pci/controller/vmd.c: In function 'vmd_from_bus': /kisskb/src/drivers/pci/controller/vmd.c:127:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: some warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/pci/controller/vmd.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/pci/controller] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/pci] Error 2 make[2]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/drivers/dma/idxd/init.c:24:0: /kisskb/src/drivers/dma/idxd/perfmon.h: In function 'event_to_pmu': /kisskb/src/drivers/dma/idxd/perfmon.h:24:13: error: 'struct perf_event' has no member named 'pmu' pmu = event->pmu; ^ /kisskb/src/drivers/dma/idxd/perfmon.h: In function 'event_to_idxd': /kisskb/src/drivers/dma/idxd/perfmon.h:35:13: error: 'struct perf_event' has no member named 'pmu' pmu = event->pmu; ^ /kisskb/src/drivers/dma/idxd/init.c: In function 'idxd_init_module': /kisskb/src/drivers/dma/idxd/init.c:805:7: error: implicit declaration of function 'cpu_feature_enabled' [-Werror=implicit-function-declaration] if (!cpu_feature_enabled(X86_FEATURE_MOVDIR64B)) { ^ cc1: some warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/dma/idxd/init.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/dma/idxd] Error 2 make[3]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/dma/ioat/dca.c: In function 'dca_enabled_in_bios': /kisskb/src/drivers/dma/ioat/dca.c:64:18: error: implicit declaration of function 'cpuid_eax' [-Werror=implicit-function-declaration] cpuid_level_9 = cpuid_eax(9); ^ /kisskb/src/drivers/dma/ioat/dca.c: In function 'system_has_dca_enabled': /kisskb/src/drivers/dma/ioat/dca.c:74:6: error: implicit declaration of function 'boot_cpu_has' [-Werror=implicit-function-declaration] if (boot_cpu_has(X86_FEATURE_DCA)) ^ /kisskb/src/drivers/dma/ioat/dca.c: In function 'ioat_dca_get_tag': /kisskb/src/drivers/dma/ioat/dca.c:17:31: error: implicit declaration of function 'cpuid_ebx' [-Werror=implicit-function-declaration] #define cpu_physical_id(cpu) (cpuid_ebx(1) >> 24) ^ /kisskb/src/drivers/dma/ioat/dca.c:185:12: note: in expansion of macro 'cpu_physical_id' apic_id = cpu_physical_id(cpu); ^ cc1: some warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/dma/ioat/dca.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/dma/ioat] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/dma] Error 2 /kisskb/src/drivers/video/fbdev/riva/fbdev.c: In function 'rivafb_probe': /kisskb/src/drivers/video/fbdev/riva/fbdev.c:2059:11: warning: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Wdiscarded-qualifiers] iounmap(default_par->riva.PRAMIN); ^ In file included from /kisskb/src/arch/um/include/asm/io.h:7:0, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/include/asm-generic/hardirq.h:17, from /kisskb/src/arch/um/include/asm/hardirq.h:5, from /kisskb/src/include/linux/hardirq.h:11, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/trace_recursion.h:5, from /kisskb/src/include/linux/ftrace.h:10, from /kisskb/src/include/linux/kprobes.h:29, from /kisskb/src/include/linux/kgdb.h:19, from /kisskb/src/include/linux/fb.h:5, from /kisskb/src/drivers/video/fbdev/riva/fbdev.c:39: /kisskb/src/include/asm-generic/logic_io.h:36:17: note: expected 'void *' but argument is of type 'volatile U032 * {aka volatile unsigned int *}' #define iounmap iounmap ^ /kisskb/src/include/asm-generic/logic_io.h:37:6: note: in expansion of macro 'iounmap' void iounmap(void __iomem *addr); ^ /kisskb/src/drivers/video/fbdev/riva/fbdev.c: In function 'rivafb_remove': /kisskb/src/drivers/video/fbdev/riva/fbdev.c:2092:11: warning: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Wdiscarded-qualifiers] iounmap(par->riva.PRAMIN); ^ In file included from /kisskb/src/arch/um/include/asm/io.h:7:0, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/include/asm-generic/hardirq.h:17, from /kisskb/src/arch/um/include/asm/hardirq.h:5, from /kisskb/src/include/linux/hardirq.h:11, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/trace_recursion.h:5, from /kisskb/src/include/linux/ftrace.h:10, from /kisskb/src/include/linux/kprobes.h:29, from /kisskb/src/include/linux/kgdb.h:19, from /kisskb/src/include/linux/fb.h:5, from /kisskb/src/drivers/video/fbdev/riva/fbdev.c:39: /kisskb/src/include/asm-generic/logic_io.h:36:17: note: expected 'void *' but argument is of type 'volatile U032 * {aka volatile unsigned int *}' #define iounmap iounmap ^ /kisskb/src/include/asm-generic/logic_io.h:37:6: note: in expansion of macro 'iounmap' void iounmap(void __iomem *addr); ^ /kisskb/src/drivers/video/fbdev/nvidia/nvidia.c: In function 'nvidiafb_probe': /kisskb/src/drivers/video/fbdev/nvidia/nvidia.c:1414:10: warning: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Wdiscarded-qualifiers] iounmap(par->REGS); ^ In file included from /kisskb/src/arch/um/include/asm/io.h:7:0, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/include/asm-generic/hardirq.h:17, from /kisskb/src/arch/um/include/asm/hardirq.h:5, from /kisskb/src/include/linux/hardirq.h:11, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/trace_recursion.h:5, from /kisskb/src/include/linux/ftrace.h:10, from /kisskb/src/include/linux/kprobes.h:29, from /kisskb/src/include/linux/kgdb.h:19, from /kisskb/src/include/linux/fb.h:5, from /kisskb/src/drivers/video/fbdev/nvidia/nvidia.c:19: /kisskb/src/include/asm-generic/logic_io.h:36:17: note: expected 'void *' but argument is of type 'volatile u32 * {aka volatile unsigned int *}' #define iounmap iounmap ^ /kisskb/src/include/asm-generic/logic_io.h:37:6: note: in expansion of macro 'iounmap' void iounmap(void __iomem *addr); ^ /kisskb/src/drivers/video/fbdev/nvidia/nvidia.c: In function 'nvidiafb_remove': /kisskb/src/drivers/video/fbdev/nvidia/nvidia.c:1439:10: warning: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Wdiscarded-qualifiers] iounmap(par->REGS); ^ In file included from /kisskb/src/arch/um/include/asm/io.h:7:0, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/include/asm-generic/hardirq.h:17, from /kisskb/src/arch/um/include/asm/hardirq.h:5, from /kisskb/src/include/linux/hardirq.h:11, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/trace_recursion.h:5, from /kisskb/src/include/linux/ftrace.h:10, from /kisskb/src/include/linux/kprobes.h:29, from /kisskb/src/include/linux/kgdb.h:19, from /kisskb/src/include/linux/fb.h:5, from /kisskb/src/drivers/video/fbdev/nvidia/nvidia.c:19: /kisskb/src/include/asm-generic/logic_io.h:36:17: note: expected 'void *' but argument is of type 'volatile u32 * {aka volatile unsigned int *}' #define iounmap iounmap ^ /kisskb/src/include/asm-generic/logic_io.h:37:6: note: in expansion of macro 'iounmap' void iounmap(void __iomem *addr); ^ make[1]: *** [/kisskb/src/Makefile:1841: drivers] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:220: __sub-make] Error 2 Command 'make -s -j 48 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:04:45.140046