diff options
| author | David S. Miller <davem@davemloft.net> | 2018-10-18 09:55:08 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-18 09:55:08 -0700 |
| commit | 2ee653f644ab203364724cac85a7efd371367979 (patch) | |
| tree | ef4bec49238cf32b0eb32624c2db14daa2edaf8b /MAINTAINERS | |
| parent | eddf016b910486d2123675a6b5fd7d64f77cdca8 (diff) | |
| parent | 9dffff200fd178f11dd50eb1fd8ccd0650c9284e (diff) | |
| download | linux-stable-2ee653f644ab203364724cac85a7efd371367979.tar.gz linux-stable-2ee653f644ab203364724cac85a7efd371367979.tar.bz2 linux-stable-2ee653f644ab203364724cac85a7efd371367979.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
pull request (net): ipsec 2018-10-18
1) Free the xfrm interface gro_cells when deleting the
interface, otherwise we leak it. From Li RongQing.
2) net/core/flow.c does not exist anymore, so remove it
from the MAINTAINERS file.
3) Fix a slab-out-of-bounds in _decode_session6.
From Alexei Starovoitov.
4) Fix RCU protection when policies inserted into
thei bydst lists. From Florian Westphal.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6ac000cc006d..85e7152c8f62 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10122,7 +10122,6 @@ L: netdev@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git S: Maintained -F: net/core/flow.c F: net/xfrm/ F: net/key/ F: net/ipv4/xfrm* |