projects / linux-2.6-block.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c778980 c165d57)
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)
commitb6f875a8d95e440369845ad43589eda401c30079
treee8efd00b0b704e18a4bcc63e3c88146375aaf032tree | snapshot
parentc778980a6594880204a44207e5cdceea6e859a1ccommit | diff
parentc165d57b552aaca607fa5daf3fb524a6efe3c5a3commit | diff
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 <davem@davemloft.net>
Linux 6.x block layer and io_uring tree(s)