diff options
| author | David S. Miller <davem@davemloft.net> | 2021-08-27 13:16:29 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-08-27 13:16:29 +0300 |
| commit | fe50893aa86eb9f1c6ccf2ceef274193b6313aad (patch) | |
| tree | fac6e4190b44253974e894133d7590e4d9341e5d /net/xfrm/xfrm_ipcomp.c | |
| parent | a550409378d2aea4d2104a551c192e7a65ddd6c0 (diff) | |
| parent | 5d8dbb7fb82b8661c16d496644b931c0e2e3a12e (diff) | |
| download | linux-fe50893aa86eb9f1c6ccf2ceef274193b6313aad.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/
ipsec-next
Steffen Klassert says:
====================
pull request (net-next): ipsec-next 2021-08-27
1) Remove an unneeded extra variable in esp4 esp_ssg_unref.
From Corey Minyard.
2) Add a configuration option to change the default behaviour
to block traffic if there is no matching policy.
Joint work with Christian Langrock and Antony Antony.
3) Fix a shift-out-of-bounce bug reported from syzbot.
From Pavel Skripkin.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm/xfrm_ipcomp.c')
0 files changed, 0 insertions, 0 deletions