Commit 0cd7d979 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching

Pull livepatching update from Jiri Kosina:
 "livepatching kselftest output fix from Miroslav Benes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching:
  selftests/livepatch: Do not check order when using "comm" for dmesg checking
parents 4a165feb 884ee754
...@@ -278,7 +278,7 @@ function check_result { ...@@ -278,7 +278,7 @@ function check_result {
# help differentiate repeated testing runs. Remove them with a # help differentiate repeated testing runs. Remove them with a
# post-comparison sed filter. # post-comparison sed filter.
result=$(dmesg | comm -13 "$SAVED_DMESG" - | \ result=$(dmesg | comm --nocheck-order -13 "$SAVED_DMESG" - | \
grep -e 'livepatch:' -e 'test_klp' | \ grep -e 'livepatch:' -e 'test_klp' | \
grep -v '\(tainting\|taints\) kernel' | \ grep -v '\(tainting\|taints\) kernel' | \
sed 's/^\[[ 0-9.]*\] //') sed 's/^\[[ 0-9.]*\] //')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment