From: David S. Miller Date: Fri, 1 May 2020 01:07:16 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b6f875a8d95e440369845ad43589eda401c30079;p=linux.git Merge git://git./pub/scm/linux/kernel/git/pablo/nf Pablo Neira Ayuso says: ==================== Netfilter fixes for net The following patchset contains Netfilter fixes for net: 1) Do not update the UDP checksum when it's zero, from Guillaume Nault. 2) Fix return of local variable in nf_osf, from Arnd Bergmann. ==================== Signed-off-by: David S. Miller --- b6f875a8d95e440369845ad43589eda401c30079