]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit15aaa5b54e295707bd3a87598d192df40f4e138a
treea8fa6e1ed936c8d3295f77131fd59d73dda6cc57
parente0726529ff5e3a8f56c432b1b3d762b327bacb58
parente78e41a53372af25737fbc96e9e5de3e93e238ce
Merge branch 'master' of git://git.kernel.org/pub/scm/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>