From: Jakub Kicinski <kuba@kernel.org>
Date: Wed, 14 Dec 2022 03:32:52 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6.1.0-07460-g7ae9888d6e1c;p=linux.git

Merge git://git./linux/kernel/git/netfilter/nf

Pablo Neira Ayuso says:

====================
Netfilter/IPVS fixes for net

1) Fix NAT IPv6 flowtable hardware offload, from Qingfang DENG.

2) Add a safety check to IPVS socket option interface report a
   warning if unsupported command is seen, this. From Li Qiong.

3) Document SCTP conntrack timeouts, from Sriram Yagnaraman.

* git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf:
  netfilter: conntrack: document sctp timeouts
  ipvs: add a 'default' case in do_ip_vs_set_ctl()
  netfilter: flowtable: really fix NAT IPv6 offload
====================

Link: https://lore.kernel.org/r/20221213140923.154594-1-pablo@netfilter.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

7ae9888d6e1ce4062d27367a28e46a26270a3e52