]> 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)
commit8a1ee8ba820d14614a6784efb17d8508a5c6c2d9
treea8fa6e1ed936c8d3295f77131fd59d73dda6cc57
parent5a3158397bfaec0de9f7e5107e56bce0a1eb7b23
parent45b034718fc979d899b2f663b941e8d8f4f2bb37
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>