| commit | b6f875a8d95e440369845ad43589eda401c30079 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Apr 30 18:07:16 2020 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Thu Apr 30 18:07:16 2020 -0700 |
| tree | e8efd00b0b704e18a4bcc63e3c88146375aaf032 | |
| parent | c778980a6594880204a44207e5cdceea6e859a1c [diff] | |
| parent | c165d57b552aaca607fa5daf3fb524a6efe3c5a3 [diff] |
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>