From: David S. Miller <davem@davemloft.net>
Date: Wed, 14 Apr 2021 20:15:12 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec... 
X-Git-Tag: v5.15~1236^2~151
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8c1186be3f1b02ec85db003506b1aa71d5dc5a1b;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'master' of git://git./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>
---

8c1186be3f1b02ec85db003506b1aa71d5dc5a1b