Commit d009de7d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'livepatching-for-6.14-rc2' of... 

Merge tag 'livepatching-for-6.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching

Pull livepatching fix from Petr Mladek:

 - Fix livepatching selftests for util-linux-2.40.x

* tag 'livepatching-for-6.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching:
  selftests: livepatch: handle PRINTK_CALLER in check_result()
parents f5a26013 28aecef5

tools/testing/selftests/livepatch/functions.sh

+2 −1
Original line number Diff line number Diff line
@@ -306,7 +306,8 @@ function check_result { 
	result=$(dmesg | awk -v last_dmesg="$LAST_DMESG" 'p; $0 == last_dmesg { p=1 }' | \

		 grep -e 'livepatch:' -e 'test_klp' | \

		 grep -v '\(tainting\|taints\) kernel' | \

		 sed 's/^\[[ 0-9.]*\] //')

		 sed 's/^\[[ 0-9.]*\] //' | \

		 sed 's/^\[[ ]*[CT][0-9]*\] //')



	if [[ "$expect" == "$result" ]] ; then

		echo "ok"