]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
authorDavid S. Miller <davem@davemloft.net>
Fri, 1 May 2020 01:07:16 +0000 (18:07 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 1 May 2020 01:07:16 +0000 (18:07 -0700)
commitc359c3fe7c42c34ec8cd15567f2bd8e1dee1bfc9
treee8efd00b0b704e18a4bcc63e3c88146375aaf032
parentdd13d8d893537decd0547949f39804695104ad4c
parent43dc18089560102ccc0ac022422c9c26aadfbae8
Merge git://git.kernel.org/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 <davem@davemloft.net>