From: David S. Miller Date: Sun, 2 Sep 2018 00:16:59 +0000 (-0700) Subject: Merge branch 'dpaa2-eth-Move-DPAA2-Ethernet-driver' X-Git-Tag: v4.20-rc1~27^2~468 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=531778d0e3a371f05442830df954bc6215f1c19e;p=linux.git Merge branch 'dpaa2-eth-Move-DPAA2-Ethernet-driver' Ioana Radulescu says: ==================== dpaa2-eth: Move DPAA2 Ethernet driver The Freescale/NXP DPAA2 Ethernet driver was first included in drivers/staging, due to its dependencies on two components located there at the time of its initial submission: * the fsl-mc bus driver, which was moved to drivers/bus in kernel 4.17 * the dpio driver, which was moved to drivers/soc/fsl in kernel 4.18 More information on the DPAA2 architecture and the interactions between the fsl-mc bus and the objects present on it can be found in: Documentation/networking/dpaa2/overview.rst For easier review, the patch is generated without the -M option, although the driver files are moved without any code changes. changes since v1[1]: * remove RFC label, since dependencies have been merged on net-next * add patch fixing a possible race at probe (reported by Andrew Lunn) [1] https://lore.kernel.org/patchwork/patch/971333/ ==================== Signed-off-by: David S. Miller --- 531778d0e3a371f05442830df954bc6215f1c19e