Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter...
authorJakub Kicinski <kuba@kernel.org>
Thu, 22 Sep 2022 01:42:54 +0000 (18:42 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 22 Sep 2022 01:42:54 +0000 (18:42 -0700)
commit7a5d48c4463e6ef896ea2190a97d9e90b37c38da
treea8fa6e1ed936c8d3295f77131fd59d73dda6cc57
parent393d34cb862e6de0c283408149da2b9093d5a5c4
parent72f5c89804636b5b4c8599354a92d6df8cff42cc
Merge branch 'master' of git://git./linux/kernel/git/netfilter/nf-next

Florian Westphal says:

====================
netfilter patches for net-next

Remove GPL license copypastry in uapi files, those have SPDX tags.
From Christophe Jaillet.

Remove unused variable in rpfilter, from Guillaume Nault.

Rework gc resched delay computation in conntrack, from Antoine Tenart.

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next:
  netfilter: rpfilter: Remove unused variable 'ret'.
  headers: Remove some left-over license text in include/uapi/linux/netfilter/
  netfilter: conntrack: revisit the gc initial rescheduling bias
  netfilter: conntrack: fix the gc rescheduling delay
====================

Link: https://lore.kernel.org/r/20220921095000.29569-1-fw@strlen.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>