projects/linux·commit 0cd7d979

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

0cd7d979 · Linus Torvalds <[email protected]> · 2020-10-15 15:07:57 -07:00

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
Commit
0cd7d9795fa82226e7516d38b474bddae8b1ff26
Parents
4a165feb · 884ee754

Merge commit. Changes below are compared with the first parent: 4a165feb.

Changes

1 files changed · +1 −1

FileStatusAddDelContent
tools/testing/selftests/livepatch/functions.shmodified+1−1View file

tools/testing/selftests/livepatch/functions.sh

View file
diff --git a/tools/testing/selftests/livepatch/functions.sh b/tools/testing/selftests/livepatch/functions.sh
index 1aba83c..846c7ed 100644
--- a/tools/testing/selftests/livepatch/functions.sh
+++ b/tools/testing/selftests/livepatch/functions.sh
@@ -278,7 +278,7 @@ function check_result {
# help differentiate repeated testing runs. Remove them with a
# 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 -v '\(tainting\|taints\) kernel' | \
sed 's/^\[[ 0-9.]*\] //')