From: David S. Miller <davem@davemloft.net>
Date: Fri, 27 Aug 2021 10:16:29 +0000 (+0100)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/
X-Git-Tag: libata-5.15-2021-09-05~51^2~52
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=fe50893aa86eb9f1c6ccf2ceef274193b6313aad;p=linux-2.6-block.git

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

Steffen Klassert says:

====================
pull request (net-next): ipsec-next 2021-08-27

1) Remove an unneeded extra variable in esp4 esp_ssg_unref.
   From Corey Minyard.

2) Add a configuration option to change the default behaviour
   to block traffic if there is no matching policy.
   Joint work with Christian Langrock and Antony Antony.

3) Fix a shift-out-of-bounce bug reported from syzbot.
   From Pavel Skripkin.

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

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

fe50893aa86eb9f1c6ccf2ceef274193b6313aad