# git rev-parse -q --verify 9e9fb7655ed585da8f468e29221f0ba194a5f613^{commit} 9e9fb7655ed585da8f468e29221f0ba194a5f613 already have revision, skipping fetch # git checkout -q -f -B kisskb 9e9fb7655ed585da8f468e29221f0ba194a5f613 # git clean -qxdf # < git log -1 # commit 9e9fb7655ed585da8f468e29221f0ba194a5f613 # Merge: 86ac54e79fe0 29ce8f970107 # Author: Linus Torvalds # Date: Tue Aug 31 16:43:06 2021 -0700 # # Merge tag 'net-next-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next # # Pull networking updates from Jakub Kicinski: # "Core: # # - Enable memcg accounting for various networking objects. # # BPF: # # - Introduce bpf timers. # # - Add perf link and opaque bpf_cookie which the program can read out # again, to be used in libbpf-based USDT library. # # - Add bpf_task_pt_regs() helper to access user space pt_regs in # kprobes, to help user space stack unwinding. # # - Add support for UNIX sockets for BPF sockmap. # # - Extend BPF iterator support for UNIX domain sockets. # # - Allow BPF TCP congestion control progs and bpf iterators to call # bpf_setsockopt(), e.g. to switch to another congestion control # algorithm. # # Protocols: # # - Support IOAM Pre-allocated Trace with IPv6. # # - Support Management Component Transport Protocol. # # - bridge: multicast: add vlan support. # # - netfilter: add hooks for the SRv6 lightweight tunnel driver. # # - tcp: # - enable mid-stream window clamping (by user space or BPF) # - allow data-less, empty-cookie SYN with TFO_SERVER_COOKIE_NOT_REQD # - more accurate DSACK processing for RACK-TLP # # - mptcp: # - add full mesh path manager option # - add partial support for MP_FAIL # - improve use of backup subflows # - optimize option processing # # - af_unix: add OOB notification support. # # - ipv6: add IFLA_INET6_RA_MTU to expose MTU value advertised by the # router. # # - mac80211: Target Wake Time support in AP mode. # # - can: j1939: extend UAPI to notify about RX status. # # Driver APIs: # # - Add page frag support in page pool API. # # - Many improvements to the DSA (distributed switch) APIs. # # - ethtool: extend IRQ coalesce uAPI with timer reset modes. # # - devlink: control which auxiliary devices are created. # # - Support CAN PHYs via the generic PHY subsystem. # # - Proper cross-chip support for tag_8021q. # # - Allow TX forwarding for the software bridge data path to be # offloaded to capable devices. # # Drivers: # # - veth: more flexible channels number configuration. # # - openvswitch: introduce per-cpu upcall dispatch. # # - Add internet mix (IMIX) mode to pktgen. # # - Transparently handle XDP operations in the bonding driver. # # - Add LiteETH network driver. # # - Renesas (ravb): # - support Gigabit Ethernet IP # # - NXP Ethernet switch (sja1105): # - fast aging support # - support for "H" switch topologies # - traffic termination for ports under VLAN-aware bridge # # - Intel 1G Ethernet # - support getcrosststamp() with PCIe PTM (Precision Time # Measurement) for better time sync # - support Credit-Based Shaper (CBS) offload, enabling HW traffic # prioritization and bandwidth reservation # # - Broadcom Ethernet (bnxt) # - support pulse-per-second output # - support larger Rx rings # # - Mellanox Ethernet (mlx5) # - support ethtool RSS contexts and MQPRIO channel mode # - support LAG offload with bridging # - support devlink rate limit API # - support packet sampling on tunnels # # - Huawei Ethernet (hns3): # - basic devlink support # - add extended IRQ coalescing support # - report extended link state # # - Netronome Ethernet (nfp): # - add conntrack offload support # # - Broadcom WiFi (brcmfmac): # - add WPA3 Personal with FT to supported cipher suites # - support 43752 SDIO device # # - Intel WiFi (iwlwifi): # - support scanning hidden 6GHz networks # - support for a new hardware family (Bz) # # - Xen pv driver: # - harden netfront against malicious backends # # - Qualcomm mobile # - ipa: refactor power management and enable automatic suspend # - mhi: move MBIM to WWAN subsystem interfaces # # Refactor: # # - Ambient BPF run context and cgroup storage cleanup. # # - Compat rework for ndo_ioctl. # # Old code removal: # # - prism54 remove the obsoleted driver, deprecated by the p54 driver. # # - wan: remove sbni/granch driver" # # * tag 'net-next-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next: (1715 commits) # net: Add depends on OF_NET for LiteX's LiteETH # ipv6: seg6: remove duplicated include # net: hns3: remove unnecessary spaces # net: hns3: add some required spaces # net: hns3: clean up a type mismatch warning # net: hns3: refine function hns3_set_default_feature() # ipv6: remove duplicated 'net/lwtunnel.h' include # net: w5100: check return value after calling platform_get_resource() # net/mlxbf_gige: Make use of devm_platform_ioremap_resourcexxx() # net: mdio: mscc-miim: Make use of the helper function devm_platform_ioremap_resource() # net: mdio-ipq4019: Make use of devm_platform_ioremap_resource() # fou: remove sparse errors # ipv4: fix endianness issue in inet_rtm_getroute_build_skb() # octeontx2-af: Set proper errorcode for IPv4 checksum errors # octeontx2-af: Fix static code analyzer reported issues # octeontx2-af: Fix mailbox errors in nix_rss_flowkey_cfg # octeontx2-af: Fix loop in free and unmap counter # af_unix: fix potential NULL deref in unix_dgram_connect() # dpaa2-eth: Replace strlcpy with strscpy # octeontx2-af: Use NDC TX for transmit packet data # ... # < /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 9e9fb7655ed585da8f468e29221f0ba194a5f613 # < 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:11623:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:11626:warning: override: reassigning to symbol GCC_PLUGIN_RANDSTRUCT .config:11628:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:11630:warning: override: reassigning to symbol UML_NET_SLIP .config:11633:warning: override: reassigning to symbol UML_NET_MCAST .config:11635: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/kernel/trace/trace_osnoise.c: In function 'start_kthread': /kisskb/src/kernel/trace/trace_osnoise.c:1515: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.... /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); ^ 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.... /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:1851: drivers] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:220: __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:05:04.705782