# git rev-parse -q --verify 8096acd7442e613fad0354fc8dfdb2003cceea0b^{commit} 8096acd7442e613fad0354fc8dfdb2003cceea0b already have revision, skipping fetch # git checkout -q -f -B kisskb 8096acd7442e613fad0354fc8dfdb2003cceea0b # git clean -qxdf # < git log -1 # commit 8096acd7442e613fad0354fc8dfdb2003cceea0b # Merge: d1d488d81370 bcb9928a1554 # Author: Linus Torvalds # Date: Wed Jul 14 09:24:32 2021 -0700 # # Merge tag 'net-5.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net # # Pull networking fixes from Jakub Kicinski. # "Including fixes from bpf and netfilter. # # Current release - regressions: # # - sock: fix parameter order in sock_setsockopt() # # Current release - new code bugs: # # - netfilter: nft_last: # - fix incorrect arithmetic when restoring last used # - honor NFTA_LAST_SET on restoration # # Previous releases - regressions: # # - udp: properly flush normal packet at GRO time # # - sfc: ensure correct number of XDP queues; don't allow enabling the # feature if there isn't sufficient resources to Tx from any CPU # # - dsa: sja1105: fix address learning getting disabled on the CPU port # # - mptcp: addresses a rmem accounting issue that could keep packets in # subflow receive buffers longer than necessary, delaying MPTCP-level # ACKs # # - ip_tunnel: fix mtu calculation for ETHER tunnel devices # # - do not reuse skbs allocated from skbuff_fclone_cache in the napi # skb cache, we'd try to return them to the wrong slab cache # # - tcp: consistently disable header prediction for mptcp # # Previous releases - always broken: # # - bpf: fix subprog poke descriptor tracking use-after-free # # - ipv6: # - allocate enough headroom in ip6_finish_output2() in case # iptables TEE is used # - tcp: drop silly ICMPv6 packet too big messages to avoid # expensive and pointless lookups (which may serve as a DDOS # vector) # - make sure fwmark is copied in SYNACK packets # - fix 'disable_policy' for forwarded packets (align with IPv4) # # - netfilter: conntrack: # - do not renew entry stuck in tcp SYN_SENT state # - do not mark RST in the reply direction coming after SYN packet # for an out-of-sync entry # # - mptcp: cleanly handle error conditions with MP_JOIN and syncookies # # - mptcp: fix double free when rejecting a join due to port mismatch # # - validate lwtstate->data before returning from skb_tunnel_info() # # - tcp: call sk_wmem_schedule before sk_mem_charge in zerocopy path # # - mt76: mt7921: continue to probe driver when fw already downloaded # # - bonding: fix multiple issues with offloading IPsec to (thru?) bond # # - stmmac: ptp: fix issues around Qbv support and setting time back # # - bcmgenet: always clear wake-up based on energy detection # # Misc: # # - sctp: move 198 addresses from unusable to private scope # # - ptp: support virtual clocks and timestamping # # - openvswitch: optimize operation for key comparison" # # * tag 'net-5.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (158 commits) # net: dsa: properly check for the bridge_leave methods in dsa_switch_bridge_leave() # sfc: add logs explaining XDP_TX/REDIRECT is not available # sfc: ensure correct number of XDP queues # sfc: fix lack of XDP TX queues - error XDP TX failed (-22) # net: fddi: fix UAF in fza_probe # net: dsa: sja1105: fix address learning getting disabled on the CPU port # net: ocelot: fix switchdev objects synced for wrong netdev with LAG offload # net: Use nlmsg_unicast() instead of netlink_unicast() # octeontx2-pf: Fix uninitialized boolean variable pps # ipv6: allocate enough headroom in ip6_finish_output2() # net: hdlc: rename 'mod_init' & 'mod_exit' functions to be module-specific # net: bridge: multicast: fix MRD advertisement router port marking race # net: bridge: multicast: fix PIM hello router port marking race # net: phy: marvell10g: fix differentiation of 88X3310 from 88X3340 # dsa: fix for_each_child.cocci warnings # virtio_net: check virtqueue_add_sgs() return value # mptcp: properly account bulk freed memory # selftests: mptcp: fix case multiple subflows limited by server # mptcp: avoid processing packet if a subflow reset # mptcp: fix syncookie process if mptcp can not_accept new subflow # ... # < /opt/cross/kisskb/br-xtensa-full-2016.08-613-ge98b4dd/bin/xtensa-linux-gcc --version # < /opt/cross/kisskb/br-xtensa-full-2016.08-613-ge98b4dd/bin/xtensa-linux-ld --version # < git log --format=%s --max-count=1 8096acd7442e613fad0354fc8dfdb2003cceea0b # < make -s -j 48 ARCH=xtensa O=/kisskb/build/linus_xtensa-allmodconfig_xtensa CROSS_COMPILE=/opt/cross/kisskb/br-xtensa-full-2016.08-613-ge98b4dd/bin/xtensa-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # < make -s -j 48 ARCH=xtensa O=/kisskb/build/linus_xtensa-allmodconfig_xtensa CROSS_COMPILE=/opt/cross/kisskb/br-xtensa-full-2016.08-613-ge98b4dd/bin/xtensa-linux- help # make -s -j 48 ARCH=xtensa O=/kisskb/build/linus_xtensa-allmodconfig_xtensa CROSS_COMPILE=/opt/cross/kisskb/br-xtensa-full-2016.08-613-ge98b4dd/bin/xtensa-linux- olddefconfig # make -s -j 48 ARCH=xtensa O=/kisskb/build/linus_xtensa-allmodconfig_xtensa CROSS_COMPILE=/opt/cross/kisskb/br-xtensa-full-2016.08-613-ge98b4dd/bin/xtensa-linux- /kisskb/src/drivers/gpu/drm/rockchip/cdn-dp-core.c:1126:12: warning: 'cdn_dp_resume' defined but not used [-Wunused-function] static int cdn_dp_resume(struct device *dev) ^ /kisskb/src/drivers/input/joystick/analog.c:160:2: warning: #warning Precise timer not defined for this architecture. [-Wcpp] #warning Precise timer not defined for this architecture. ^ In file included from :0:0: /kisskb/src/drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c: In function 'ifh_encode_bitfield': /kisskb/src/include/linux/compiler_types.h:328:38: error: call to '__compiletime_assert_418' declared with attribute error: Unsupported width, must be <= 40 _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^ /kisskb/src/include/linux/compiler_types.h:309:4: note: in definition of macro '__compiletime_assert' prefix ## suffix(); \ ^ /kisskb/src/include/linux/compiler_types.h:328:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^ /kisskb/src/drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c:28:2: note: in expansion of macro 'compiletime_assert' compiletime_assert(width <= 40, "Unsupported width, must be <= 40"); ^ make[6]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/net/ethernet/microchip/sparx5/sparx5_netdev.o] Error 1 make[6]: *** Waiting for unfinished jobs.... make[5]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/net/ethernet/microchip/sparx5] Error 2 make[4]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/net/ethernet/microchip] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/net/ethernet] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/net] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1841: drivers] Error 2 make: *** [Makefile:220: __sub-make] Error 2 Command 'make -s -j 48 ARCH=xtensa O=/kisskb/build/linus_xtensa-allmodconfig_xtensa CROSS_COMPILE=/opt/cross/kisskb/br-xtensa-full-2016.08-613-ge98b4dd/bin/xtensa-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_xtensa-allmodconfig_xtensa # Build took: 0:14:17.705379