# git rev-parse -q --verify fa2e1ba3e9e39072fa7a6a9d11ac432c505b4ac7^{commit} fa2e1ba3e9e39072fa7a6a9d11ac432c505b4ac7 already have revision, skipping fetch # git checkout -q -f -B kisskb fa2e1ba3e9e39072fa7a6a9d11ac432c505b4ac7 # git clean -qxdf # < git log -1 # commit fa2e1ba3e9e39072fa7a6a9d11ac432c505b4ac7 # Merge: f4484d138b31 ff9fc0a31d85 # Author: Linus Torvalds # Date: Thu Jan 20 10:57:05 2022 +0200 # # Merge tag 'net-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net # # Pull networking fixes from Jakub Kicinski: # "Including fixes from netfilter, bpf. # # Quite a handful of old regression fixes but most of those are # pre-5.16. # # Current release - regressions: # # - fix memory leaks in the skb free deferral scheme if upper layer # protocols are used, i.e. in-kernel TCP readers like TLS # # Current release - new code bugs: # # - nf_tables: fix NULL check typo in _clone() functions # # - change the default to y for Vertexcom vendor Kconfig # # - a couple of fixes to incorrect uses of ref tracking # # - two fixes for constifying netdev->dev_addr # # Previous releases - regressions: # # - bpf: # - various verifier fixes mainly around register offset handling # when passed to helper functions # - fix mount source displayed for bpffs (none -> bpffs) # # - bonding: # - fix extraction of ports for connection hash calculation # - fix bond_xmit_broadcast return value when some devices are down # # - phy: marvell: add Marvell specific PHY loopback # # - sch_api: don't skip qdisc attach on ingress, prevent ref leak # # - htb: restore minimal packet size handling in rate control # # - sfp: fix high power modules without diagnostic monitoring # # - mscc: ocelot: # - don't let phylink re-enable TX PAUSE on the NPI port # - don't dereference NULL pointers with shared tc filters # # - smsc95xx: correct reset handling for LAN9514 # # - cpsw: avoid alignment faults by taking NET_IP_ALIGN into account # # - phy: micrel: use kszphy_suspend/_resume for irq aware devices, # avoid races with the interrupt # # Previous releases - always broken: # # - xdp: check prog type before updating BPF link # # - smc: resolve various races around abnormal connection termination # # - sit: allow encapsulated IPv6 traffic to be delivered locally # # - axienet: fix init/reset handling, add missing barriers, read the # right status words, stop queues correctly # # - add missing dev_put() in sock_timestamping_bind_phc() # # Misc: # # - ipv4: prevent accidentally passing RTO_ONLINK to # ip_route_output_key_hash() by sanitizing flags # # - ipv4: avoid quadratic behavior in netns dismantle # # - stmmac: dwmac-oxnas: add support for OX810SE # # - fsl: xgmac_mdio: add workaround for erratum A-009885" # # * tag 'net-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (92 commits) # ipv4: add net_hash_mix() dispersion to fib_info_laddrhash keys # ipv4: avoid quadratic behavior in netns dismantle # net/fsl: xgmac_mdio: Fix incorrect iounmap when removing module # powerpc/fsl/dts: Enable WA for erratum A-009885 on fman3l MDIO buses # dt-bindings: net: Document fsl,erratum-a009885 # net/fsl: xgmac_mdio: Add workaround for erratum A-009885 # net: mscc: ocelot: fix using match before it is set # net: phy: micrel: use kszphy_suspend()/kszphy_resume for irq aware devices # net: cpsw: avoid alignment faults by taking NET_IP_ALIGN into account # nfc: llcp: fix NULL error pointer dereference on sendmsg() after failed bind() # net: axienet: increase default TX ring size to 128 # net: axienet: fix for TX busy handling # net: axienet: fix number of TX ring slots for available check # net: axienet: Fix TX ring slot available check # net: axienet: limit minimum TX ring size # net: axienet: add missing memory barriers # net: axienet: reset core on initialization prior to MDIO access # net: axienet: Wait for PhyRstCmplt after core reset # net: axienet: increase reset timeout # bpf, selftests: Add ringbuf memory type confusion test # ... # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux-ld --version # < git log --format=%s --max-count=1 fa2e1ba3e9e39072fa7a6a9d11ac432c505b4ac7 # < make -s -j 32 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MIPS_CPS_NS16550_BASE=0x1b0003f8 # Added to kconfig CONFIG_MIPS_CPS_NS16550_SHIFT=0 # < make -s -j 32 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- help # make -s -j 32 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- olddefconfig .config:13502:warning: override: reassigning to symbol MIPS_CPS_NS16550_SHIFT # make -s -j 32 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- /kisskb/src/arch/mips/boot/dts/img/boston.dts:128.19-178.5: Warning (pci_device_reg): /pci@14000000/pci2_root@0,0,0: PCI unit address format error, expected "0,0" /kisskb/src/arch/mips/boot/dts/ingenic/jz4780.dtsi:513.33-515.6: Warning (unit_address_format): /nemc@13410000/efuse@d0/eth-mac-addr@0x22: unit name should not have leading "0x" In file included from /kisskb/src/sound/pci/ca0106/ca0106_main.c:156: /kisskb/src/sound/pci/ca0106/ca0106.h:62: error: "PTR" redefined [-Werror] #define PTR 0x00 /* Indexed register set pointer register */ In file included from /kisskb/src/arch/mips/include/asm/bitops.h:19, from /kisskb/src/include/linux/bitops.h:33, from /kisskb/src/include/linux/log2.h:12, from /kisskb/src/include/asm-generic/div64.h:55, from /kisskb/src/arch/mips/include/asm/div64.h:89, from /kisskb/src/include/linux/math.h:5, from /kisskb/src/include/linux/delay.h:22, from /kisskb/src/sound/pci/ca0106/ca0106_main.c:124: /kisskb/src/arch/mips/include/asm/asm.h:288: note: this is the location of the previous definition #define PTR .word cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:288: sound/pci/ca0106/ca0106_main.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:550: sound/pci/ca0106] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:550: sound/pci] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1831: sound] Error 2 make[1]: *** Waiting for unfinished jobs.... /kisskb/src/lib/test_printf.c:247: error: "PTR" redefined [-Werror] #define PTR ((void *)0x456789ab) In file included from /kisskb/src/arch/mips/include/asm/bitops.h:19, from /kisskb/src/include/linux/bitops.h:33, from /kisskb/src/include/linux/kernel.h:22, from /kisskb/src/lib/test_printf.c:9: /kisskb/src/arch/mips/include/asm/asm.h:288: note: this is the location of the previous definition #define PTR .word cc1: all warnings being treated as errors make[2]: *** [/kisskb/src/scripts/Makefile.build:288: lib/test_printf.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1831: lib] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 32 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_mips-allmodconfig_mips-gcc8 # Build took: 0:13:37.071368