From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 18 Apr 2024 18:40:54 +0000 (-0700)
Subject: Merge tag 'net-6.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: Ubuntu-6.11.0-9.9~1688
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7586c8501d090609c6eb1af6ba05e3ed68806c83;p=mirror_ubuntu-kernels.git

Merge tag 'net-6.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Pull networking fixes from Jakub Kicinski:
 "A little calmer than usual, probably just the timing of sub-tree PRs.

  Including fixes from netfilter.

  Current release - regressions:

   - inet: bring NLM_DONE out to a separate recv() again, fix user space
     which assumes multiple recv()s will happen and gets blocked forever

   - drv: mlx5:
       - restore mistakenly dropped parts in register devlink flow
       - use channel mdev reference instead of global mdev instance for
         coalescing
       - acquire RTNL lock before RQs/SQs activation/deactivation

  Previous releases - regressions:

   - net: change maximum number of UDP segments to 128, fix virtio
     compatibility with Windows peers

   - usb: ax88179_178a: avoid writing the mac address before first
     reading

  Previous releases - always broken:

   - sched: fix mirred deadlock on device recursion

   - netfilter:
       - br_netfilter: skip conntrack input hook for promisc packets
       - fixes removal of duplicate elements in the pipapo set backend
       - various fixes for abort paths and error handling

   - af_unix: don't peek OOB data without MSG_OOB

   - drv: flower: fix fragment flags handling in multiple drivers

   - drv: ravb: fix jumbo frames and packet stats accounting

  Misc:

   - kselftest_harness: fix Clang warning about zero-length format

   - tun: limit printing rate when illegal packet received by tun dev"

* tag 'net-6.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (46 commits)
  net: ethernet: ti: am65-cpsw-nuss: cleanup DMA Channels before using them
  net: usb: ax88179_178a: avoid writing the mac address before first reading
  net: ravb: Fix RX byte accounting for jumbo packets
  net: ravb: Fix GbEth jumbo packet RX checksum handling
  net: ravb: Allow RX loop to move past DMA mapping errors
  net: ravb: Count packets instead of descriptors in R-Car RX path
  net: ethernet: mtk_eth_soc: fix WED + wifi reset
  net:usb:qmi_wwan: support Rolling modules
  selftests: kselftest_harness: fix Clang warning about zero-length format
  net/sched: Fix mirred deadlock on device recursion
  netfilter: nf_tables: fix memleak in map from abort path
  netfilter: nf_tables: restore set elements when delete set fails
  netfilter: nf_tables: missing iterator type in lookup walk
  s390/ism: Properly fix receive message buffer allocation
  net: dsa: mt7530: fix port mirroring for MT7988 SoC switch
  net: dsa: mt7530: fix mirroring frames received on local port
  tun: limit printing rate when illegal packet received by tun dev
  ice: Fix checking for unsupported keys on non-tunnel device
  ice: tc: allow zero flags in parsing tc flower
  ice: tc: check src_vsi in case of traffic from VF
  ...
---

7586c8501d090609c6eb1af6ba05e3ed68806c83
diff --cc tools/testing/selftests/kselftest.h
index 7b89362da4bf,4eca3fd1292c..14bbab0cce13
--- a/tools/testing/selftests/kselftest.h
+++ b/tools/testing/selftests/kselftest.h
@@@ -292,18 -288,20 +292,20 @@@ void ksft_test_result_code(int exit_cod
  	}
  
  	/* Docs seem to call for double space if directive is absent */
- 	if (!directive[0] && msg[0])
+ 	if (!directive[0] && msg)
  		directive = " #  ";
  
- 	va_start(args, msg);
  	printf("%s %u %s%s", tap_code, ksft_test_num(), test_name, directive);
  	errno = saved_errno;
- 	vprintf(msg, args);
+ 	if (msg) {
+ 		va_start(args, msg);
+ 		vprintf(msg, args);
+ 		va_end(args);
+ 	}
  	printf("\n");
- 	va_end(args);
  }
  
 -static inline int ksft_exit_pass(void)
 +static inline __noreturn int ksft_exit_pass(void)
  {
  	ksft_print_cnts();
  	exit(KSFT_PASS);