Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netNo conflicts and no adjacent changes.Signed-off-by: Paolo Abeni <pabeni@redhat.com>