Commit 7bed1455 authored 4 years ago by David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net


Minor overlapping changes in xfrm_device.c, between the double
ESP trailing bug fix setting the XFRM_INIT flag and the changes
in net-next preparing for bonding encryption support.

Signed-off-by: David S. Miller <davem@davemloft.net>

parents b8392808 4a21185c

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 139 additions and 71 deletions

Please register or to comment