tree 544bf5861113e2f7e676a333a1267d887c800870
parent 23bfaa594002f4bba085e0a1ae3c9847b988d816
parent a3147770bea76c8dbad73eca3a24c2118da5e719
author David S. Miller <davem@davemloft.net> 1557274929 -0700
committer David S. Miller <davem@davemloft.net> 1557274929 -0700

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

Minor conflict with the DSA legacy code removal.

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