diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-08-09 13:52:36 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-08-09 13:52:36 -0700 |
| commit | 052059b663c957aea5a90f206ece4849f88f34bf (patch) | |
| tree | 9851cb16efec6cd4d0d82cdcd352c8f0565064f2 /drivers/net/ethernet/neterion | |
| parent | 99ecd6d065270c0447e33b7a14acf990fe6a2668 (diff) | |
| parent | 1d85594fd3e7e39e63b53b1bdc2d89db43b6ecd5 (diff) | |
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 <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/neterion')
0 files changed, 0 insertions, 0 deletions