tree e378147b72d9569ff7d6ad5c84acd7bfc509bca3
parent b0d04fb56b3173626a15406d69f3026ca313057f
parent d2fb4fb8ee91c1b8a1dbba6afda6f5ed2eb28bdc
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1540109318 +0200
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1540109318 +0200

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

David writes:
  "Networking:

   A few straggler bug fixes:

   1) Fix indexing of multi-pass dumps of ipv6 addresses, from David
      Ahern.

   2) Revert RCU locking change for bonding netpoll, causes worse
      problems than it solves.

   3) pskb_trim_rcsum_slow() doesn't handle odd trim offsets, resulting
      in erroneous bad hw checksum triggers with CHECKSUM_COMPLETE
      devices.  From Dimitris Michailidis.

   4) a revert to some neighbour code changes that adjust notifications
      in a way that confuses some apps."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  Revert "neighbour: force neigh_invalidate when NUD_FAILED update is from admin"
  net/ipv6: Fix index counter for unicast addresses in in6_dump_addrs
  net: fix pskb_trim_rcsum_slow() with odd trim offset
  Revert "bond: take rcu lock in netpoll_send_skb_on_dev"