From: Jakub Kicinski Date: Wed, 9 Aug 2023 20:52:36 +0000 (-0700) Subject: Merge tag 'nf-next-2023-08-08' of https://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v6.6-rc1~162^2~166 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=052059b663c957aea5a90f206ece4849f88f34bf;p=thirdparty%2Fkernel%2Flinux.git Merge tag 'nf-next-2023-08-08' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next Florian Westphal says: ==================== netfilter updates for net-next First 4 Patches, from Yue Haibing, remove unused prototypes in various netfilter headers. Last patch makes nfnetlink_log to always include a packet timestamp, up to now it was only included if the skb had assigned previously. From Maciej Żenczykowski. * tag 'nf-next-2023-08-08' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next: netfilter: nfnetlink_log: always add a timestamp netfilter: h323: Remove unused function declarations netfilter: conntrack: Remove unused function declarations netfilter: helper: Remove unused function declarations netfilter: gre: Remove unused function declaration nf_ct_gre_keymap_flush() ==================== Link: https://lore.kernel.org/r/20230808124159.19046-1-fw@strlen.de Signed-off-by: Jakub Kicinski --- 052059b663c957aea5a90f206ece4849f88f34bf