Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf
authorJakub Kicinski <kuba@kernel.org>
Thu, 28 Apr 2022 16:55:59 +0000 (09:55 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 28 Apr 2022 16:56:00 +0000 (09:56 -0700)
commitc26d0d988edddcd8c19ba59b5bc93a0cabcb6cc7
tree52bf9e4c77798fadeaffcd7168a1d1b4d822c1b2
parentaeaf59b78712c7a1827c76f086acff4f586e072f
parent743b83f15d4069ea57c3e40996bf4a1077e0cdc1
Merge git://git./linux/kernel/git/netfilter/nf

Pablo Neira Ayuso says:

====================
Netfilter fixes for net

1) Fix incorrect TCP connection tracking window reset for non-syn
   packets, from Florian Westphal.

2) Incorrect dependency on CONFIG_NFT_FLOW_OFFLOAD, from Volodymyr Mytnyk.

3) Fix nft_socket from the output path, from Florian Westphal.

* git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf:
  netfilter: nft_socket: only do sk lookups when indev is available
  netfilter: conntrack: fix udp offload timeout sysctl
  netfilter: nf_conntrack_tcp: re-init for syn packets only
====================

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