summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2023-02-01 08:19:20 +0300
committerJakub Kicinski <kuba@kernel.org>2023-02-01 08:19:20 +0300
commit64466c407a73e7c4fc49d50f4604cd22b53e50eb (patch)
tree3086c7e8911129f6d0d3d401c67aeb23bb9053c5 /.mailmap
parentafc2336f89dc0fc0ef25b92366814524b0fd90fb (diff)
parentbd0e06f0def75ba26572a94e5350324474a55562 (diff)
downloadlinux-64466c407a73e7c4fc49d50f4604cd22b53e50eb.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf
Pablo Neira Ayuso says: ==================== Netfilter fixes for net 1) Release bridge info once packet escapes the br_netfilter path, from Florian Westphal. 2) Revert incorrect fix for the SCTP connection tracking chunk iterator, also from Florian. First path fixes a long standing issue, the second path addresses a mistake in the previous pull request for net. * git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf: Revert "netfilter: conntrack: fix bug in for_each_sctp_chunk" netfilter: br_netfilter: disable sabotage_in hook after first suppression ==================== Link: https://lore.kernel.org/r/20230131133158.4052-1-pablo@netfilter.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions