diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-15 10:36:41 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-15 10:36:41 +0300 |
commit | 83be46e944f630fde26ce03cb93f61a3066448e3 (patch) | |
tree | d94a48051f9311d99b615fa06adda2511f9cff2d /tools/testing/selftests/net/ipsec.c | |
parent | f8096ff38d5f62d8a2c473e1bec0163a1b2b86d8 (diff) | |
parent | 1e28eed17697bcf343c6743f0028cc3b5dd88bf0 (diff) | |
download | linux-83be46e944f630fde26ce03cb93f61a3066448e3.tar.xz |
Merge v5.12-rc3 into char-misc-next
We need the char/misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/testing/selftests/net/ipsec.c')
-rw-r--r-- | tools/testing/selftests/net/ipsec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/net/ipsec.c b/tools/testing/selftests/net/ipsec.c index 17ced7d6ce25..f23438d512c5 100644 --- a/tools/testing/selftests/net/ipsec.c +++ b/tools/testing/selftests/net/ipsec.c @@ -1785,7 +1785,7 @@ static void grand_child_serv(unsigned int nr, int cmd_fd, void *buf, break; default: printk("got unknown msg type %d", msg->type); - }; + } } static int grand_child_f(unsigned int nr, int cmd_fd, void *buf) |