diff options
| author | David S. Miller | 2018-09-02 02:16:59 +0200 |
|---|---|---|
| committer | David S. Miller | 2018-09-02 02:16:59 +0200 |
| commit | 531778d0e3a371f05442830df954bc6215f1c19e (patch) | |
| tree | fbbb4826b8e490fb05fafebe8a6347c2ab163198 /drivers/pci/hotplug/cpci_hotplug_core.c | |
| parent | bridge: Switch to bitmap_zalloc() (diff) | |
| parent | dpaa2-eth: Move DPAA2 Ethernet driver from staging to drivers/net (diff) | |
| download | kernel-qcow2-linux-531778d0e3a371f05442830df954bc6215f1c19e.tar.gz kernel-qcow2-linux-531778d0e3a371f05442830df954bc6215f1c19e.tar.xz kernel-qcow2-linux-531778d0e3a371f05442830df954bc6215f1c19e.zip | |
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 <davem@davemloft.net>
Diffstat (limited to 'drivers/pci/hotplug/cpci_hotplug_core.c')
0 files changed, 0 insertions, 0 deletions