From: Jakub Kicinski Date: Thu, 22 Sep 2022 01:42:54 +0000 (-0700) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter... X-Git-Tag: v6.1-rc5~319^2~138 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7a5d48c4463e6ef896ea2190a97d9e90b37c38da;p=platform%2Fkernel%2Flinux-starfive.git 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 --- 7a5d48c4463e6ef896ea2190a97d9e90b37c38da