From: David S. Miller <davem@davemloft.net>
Date: Tue, 21 Jan 2020 08:25:58 +0000 (+0100)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
X-Git-Tag: v5.5~7^2~41
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=9c5ed2f831c603439c699f8cd69e9998de472526;p=linux-block.git

Merge branch 'master' of git://git./linux/kernel/git/klassert/ipsec

Steffen Klassert says:

====================
pull request (net): ipsec 2020-01-21

1) Fix packet tx through bpf_redirect() for xfrm and vti
   interfaces. From Nicolas Dichtel.

2) Do not confirm neighbor when do pmtu update on a virtual
   xfrm interface. From Xu Wang.

3) Support output_mark for offload ESP packets, this was
   forgotten when the output_mark was added initially.
   From Ulrich Weber.

Please pull or let me know if there are problems.
====================

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

9c5ed2f831c603439c699f8cd69e9998de472526