# git rev-parse -q --verify ec681c53f8d2d0ee362ff67f5b98dd8263c15002^{commit} ec681c53f8d2d0ee362ff67f5b98dd8263c15002 already have revision, skipping fetch # git checkout -q -f -B kisskb ec681c53f8d2d0ee362ff67f5b98dd8263c15002 # git clean -qxdf # < git log -1 # commit ec681c53f8d2d0ee362ff67f5b98dd8263c15002 # Merge: 26d657410983 1fcd794518b7 # Author: Linus Torvalds # Date: Thu Oct 14 18:21:39 2021 -0400 # # Merge tag 'net-5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net # # Pull networking fixes from Jakub Kicinski: # "Quite calm. # # The noisy DSA driver (embedded switches) changes, and adjustment to # IPv6 IOAM behavior add to diffstat's bottom line but are not scary. # # Current release - regressions: # # - af_unix: rename UNIX-DGRAM to UNIX to maintain backwards # compatibility # # - procfs: revert "add seq_puts() statement for dev_mcast", minor # format change broke user space # # Current release - new code bugs: # # - dsa: fix bridge_num not getting cleared after ports leaving the # bridge, resource leak # # - dsa: tag_dsa: send packets with TX fwd offload from VLAN-unaware # bridges using VID 0, prevent packet drops if pvid is removed # # - dsa: mv88e6xxx: keep the pvid at 0 when VLAN-unaware, prevent HW # getting confused about station to VLAN mapping # # Previous releases - regressions: # # - virtio-net: fix for skb_over_panic inside big mode # # - phy: do not shutdown PHYs in READY state # # - dsa: mv88e6xxx: don't use PHY_DETECT on internal PHY's, fix link # LED staying lit after ifdown # # - mptcp: fix possible infinite wait on recvmsg(MSG_WAITALL) # # - mqprio: Correct stats in mqprio_dump_class_stats() # # - ice: fix deadlock for Tx timestamp tracking flush # # - stmmac: fix feature detection on old hardware # # Previous releases - always broken: # # - sctp: account stream padding length for reconf chunk # # - icmp: fix icmp_ext_echo_iio parsing in icmp_build_probe() # # - isdn: cpai: check ctr->cnr to avoid array index out of bound # # - isdn: mISDN: fix sleeping function called from invalid context # # - nfc: nci: fix potential UAF of rf_conn_info object # # - dsa: microchip: prevent ksz_mib_read_work from kicking back in # after it's canceled in .remove and crashing # # - dsa: mv88e6xxx: isolate the ATU databases of standalone and bridged # ports # # - dsa: sja1105, ocelot: break circular dependency between switch and # tag drivers # # - dsa: felix: improve timestamping in presence of packe loss # # - mlxsw: thermal: fix out-of-bounds memory accesses # # Misc: # # - ipv6: ioam: move the check for undefined bits to improve # interoperability" # # * tag 'net-5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (60 commits) # icmp: fix icmp_ext_echo_iio parsing in icmp_build_probe # MAINTAINERS: Update the devicetree documentation path of imx fec driver # sctp: account stream padding length for reconf chunk # mlxsw: thermal: Fix out-of-bounds memory accesses # ethernet: s2io: fix setting mac address during resume # NFC: digital: fix possible memory leak in digital_in_send_sdd_req() # NFC: digital: fix possible memory leak in digital_tg_listen_mdaa() # nfc: fix error handling of nfc_proto_register() # Revert "net: procfs: add seq_puts() statement for dev_mcast" # net: encx24j600: check error in devm_regmap_init_encx24j600 # net: korina: select CRC32 # net: arc: select CRC32 # net: dsa: felix: break at first CPU port during init and teardown # net: dsa: tag_ocelot_8021q: fix inability to inject STP BPDUs into BLOCKING ports # net: dsa: felix: purge skb from TX timestamping queue if it cannot be sent # net: dsa: tag_ocelot_8021q: break circular dependency with ocelot switch lib # net: dsa: tag_ocelot: break circular dependency with ocelot switch lib driver # net: mscc: ocelot: cross-check the sequence id from the timestamp FIFO with the skb PTP header # net: mscc: ocelot: deny TX timestamping of non-PTP packets # net: mscc: ocelot: warn when a PTP IRQ is raised for an unknown skb # ... # < /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 ec681c53f8d2d0ee362ff67f5b98dd8263c15002 # < 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:11998:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:12001:warning: override: reassigning to symbol GCC_PLUGIN_RANDSTRUCT .config:12003:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:12005:warning: override: reassigning to symbol UML_NET_SLIP .config:12008:warning: override: reassigning to symbol UML_NET_MCAST .config:12010: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/x86/um/Makefile:44: FORCE prerequisite is missing /kisskb/src/drivers/video/fbdev/riva/fbdev.c: In function 'rivafb_probe': /kisskb/src/drivers/video/fbdev/riva/fbdev.c:2062:11: error: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Werror=discarded-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:6, 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:2095:11: error: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Werror=discarded-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:6, 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); ^ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:277: drivers/video/fbdev/riva/fbdev.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/video/fbdev/riva] Error 2 make[4]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/pci/controller/vmd.c:117: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:151: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:151:20: note: each undeclared identifier is reported only once for each function it appears in /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 'base_address' msg->arch_addr_lo.base_address = X86_MSI_BASE_ADDRESS_LOW; ^ /kisskb/src/drivers/pci/controller/vmd.c:152: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:153: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:751: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:128:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:277: drivers/pci/controller/vmd.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/pci/controller] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/pci] Error 2 make[2]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/video/fbdev] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/video] Error 2 make[1]: *** [/kisskb/src/Makefile:1868: drivers] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:219: __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:05:27.068614