tree 0a7976054052e793da782c2b7ec34eccfbf66449
parent cea0aa9cbd5ad4efe267e9487ed5d48d16756253
parent fe5cdef29e41c8bda8cd1a11545e7c6bfe25570e
author David S. Miller <davem@davemloft.net> 1555525585 -0700
committer David S. Miller <davem@davemloft.net> 1555525585 -0700

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

Conflict resolution of af_smc.c from Stephen Rothwell.

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