Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux...

# Conflicts:
#	tools/testing/selftests/kselftest/ktap_helpers.sh

diff --cc tools/testing/selftests/kselftest/ktap_helpers.sh
index 05a46189067198b0bfae272498b653e9fdd09a8a,531094d81f03d980069796e99b9bcb5289e401c0..8fa84b52181119ce1353de58320be051e2ac5edd
--- 1/tools/testing/selftests/kselftest/ktap_helpers.sh
--- 2/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() {
 -      echo "# Totals: pass:$KTAP_CNT_PASS fail:$KTAP_CNT_FAIL xfail:0 xpass:0 skip:$KTAP_CNT_SKIP error:0"
+       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:$KTAP_CNT_XFAIL xpass:0 skip:$KTAP_CNT_SKIP error:0"
  }

diff --cc tools/testing/selftests/rseq/rseq.h
Simple merge