tree d110323c66a0003f7c9296fb4d303ba8c57b8f03
parent 8cf5d8cc3eae2a6324ff81aa5f2f6c2f52bc5cd0
parent 4ac7a6eecbec90c7f83d5ea6f0498d9fa9c62917
author David S. Miller <davem@davemloft.net> 1612898621 -0800
committer David S. Miller <davem@davemloft.net> 1612898621 -0800

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-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>