From: Jakub Kicinski Date: Thu, 28 Apr 2022 16:55:59 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf X-Git-Tag: v6.1-rc5~1477^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c26d0d988edddcd8c19ba59b5bc93a0cabcb6cc7;p=platform%2Fkernel%2Flinux-starfive.git 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 --- c26d0d988edddcd8c19ba59b5bc93a0cabcb6cc7