tree 25b96db2550014d7f888605abfabb67a7f40a5d3
parent ebcd670d05d54ff8d17a1a51bba1ec1e4069d949
parent 531e93d11470aa2e14e6a3febef50d9bc7bab7a1
author David S. Miller <davem@davemloft.net> 1571550685 -0700
committer David S. Miller <davem@davemloft.net> 1571593380 -0700

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

Several cases of overlapping changes which were for the most
part trivially resolvable.

Signed-off-by: David S. Miller <davem@davemloft.net>