Skip to content

Commit 0cd7d97

Browse files
committed
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
2 parents 4a165fe + 884ee75 commit 0cd7d97

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

tools/testing/selftests/livepatch/functions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ function check_result {
278278
# help differentiate repeated testing runs. Remove them with a
279279
# post-comparison sed filter.
280280

281-
result=$(dmesg | comm -13 "$SAVED_DMESG" - | \
281+
result=$(dmesg | comm --nocheck-order -13 "$SAVED_DMESG" - | \
282282
grep -e 'livepatch:' -e 'test_klp' | \
283283
grep -v '\(tainting\|taints\) kernel' | \
284284
sed 's/^\[[ 0-9.]*\] //')

0 commit comments

Comments
 (0)