diff options
author | David S. Miller <davem@davemloft.net> | 2017-01-11 14:43:39 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-01-11 14:43:39 -0500 |
commit | 02ac5d1487115d160fab4c3e61b7edc20a945af9 (patch) | |
tree | 08a39341379ce6f1ad4f3997df36c76ee82cee9c /tools/testing/selftests/x86/protection_keys.c | |
parent | Merge branch 'cls_flower-ARP' (diff) | |
parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
download | linux-02ac5d1487115d160fab4c3e61b7edc20a945af9.tar.gz linux-02ac5d1487115d160fab4c3e61b7edc20a945af9.tar.bz2 linux-02ac5d1487115d160fab4c3e61b7edc20a945af9.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two AF_* families adding entries to the lockdep tables
at the same time.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/testing/selftests/x86/protection_keys.c')
-rw-r--r-- | tools/testing/selftests/x86/protection_keys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/x86/protection_keys.c b/tools/testing/selftests/x86/protection_keys.c index bdd58c78902e..df9e0a0cdf29 100644 --- a/tools/testing/selftests/x86/protection_keys.c +++ b/tools/testing/selftests/x86/protection_keys.c @@ -1367,7 +1367,7 @@ void run_tests_once(void) tracing_off(); close_test_fds(); - printf("test %2d PASSED (itertation %d)\n", test_nr, iteration_nr); + printf("test %2d PASSED (iteration %d)\n", test_nr, iteration_nr); dprintf1("======================\n\n"); } iteration_nr++; |