Subject: linux-next: manual merge of the kselftest tree with the net-next tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 8 Jan 2025 14:40:03 +1100

Hi all,

Today's linux-next merge of the kselftest tree got a conflict in:

  tools/testing/selftests/kselftest/ktap_helpers.sh

between commit:

  912d6f669725 ("selftests/net: packetdrill: report benign debug flakes as xfail")

from the net-next tree and commit:

  279e9403c5bd ("selftests: Warn about skipped tests in result summary")

from the kselftest tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc tools/testing/selftests/kselftest/ktap_helpers.sh
index 05a461890671,531094d81f03..000000000000
--- a/tools/testing/selftests/kselftest/ktap_helpers.sh
+++ b/tools/testing/selftests/kselftest/ktap_helpers.sh
@@@ -118,5 -107,9 +118,9 @@@ ktap_finished() 
  }
  
  ktap_print_totals() {
+ 	if [ "$KTAP_CNT_SKIP" -gt 0 ]; then
+ 		echo "# $KTAP_CNT_SKIP skipped test(s) detected. " \
+ 			"Consider enabling relevant config options to improve coverage."
+ 	fi
 -	echo "# Totals: pass:$KTAP_CNT_PASS fail:$KTAP_CNT_FAIL xfail:0 xpass:0 skip:$KTAP_CNT_SKIP error:0"
 +	echo "# Totals: pass:$KTAP_CNT_PASS fail:$KTAP_CNT_FAIL xfail:$KTAP_CNT_XFAIL xpass:0 skip:$KTAP_CNT_SKIP error:0"
  }