tree 1a374ad45e0cab42cacf3f9936a903269cd7ed03
parent 216f78ea8cf6fae5140aeb55657ebdab71a05502
parent 6ad2dd6c14d3989b44cdc17f1e7258bf613dd070
author David S. Miller <davem@davemloft.net> 1618431312 -0700
committer David S. Miller <davem@davemloft.net> 1618431312 -0700

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

Not much this time:

1) Simplification of some variable calculations in esp4 and esp6.
   From Jiapeng Chong and Junlin Yang.

2) Fix a clang Wformat warning in esp6 and ah6.
   From Arnd Bergmann.

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

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