From: David S. Miller <davem@davemloft.net>
Date: Tue, 9 Feb 2021 19:23:41 +0000 (-0800)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fc1a8db3d560f01e63eb9731ead2b0383349a386;p=linux.git

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

Steffen Klassert says:

====================
pull request (net-next): ipsec-next 2021-02-09

1) Support TSO on xfrm interfaces.
   From Eyal Birger.

2) Variable calculation simplifications in esp4/esp6.
   From Jiapeng Chong / Jiapeng Zhong.

3) Fix a return code in xfrm_do_migrate.
   From Zheng Yongjun.

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

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

fc1a8db3d560f01e63eb9731ead2b0383349a386