OpenCloudOS-Kernel/drivers/net/ethernet/hisilicon
Jakub Kicinski a9f852e92e Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor conflict in drivers/s390/net/qeth_l2_main.c, kept the lock
from commit c8183f5489 ("s390/qeth: fix potential deadlock on
workqueue flush"), removed the code which was removed by commit
9897d583b0 ("s390/qeth: consolidate some duplicated HW cmd code").

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
2019-11-22 16:27:24 -08:00
..
hns Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2019-11-09 11:04:37 -08:00
hns3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2019-11-22 16:27:24 -08:00
Kconfig net: hisilicon: Add support for HI13X1 to hip04_eth 2019-07-09 14:29:26 -07:00
Makefile License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
hip04_eth.c net: of_get_phy_mode: Change API to solve int/unit warnings 2019-11-04 11:21:25 -08:00
hisi_femac.c net: Remove dev_err() usage after platform_get_irq() 2019-07-30 14:37:35 -07:00
hix5hd2_gmac.c net: of_get_phy_mode: Change API to solve int/unit warnings 2019-11-04 11:21:25 -08:00
hns_mdio.c net: hisilicon: Fix usage of uninitialized variable in function mdio_sc_cfg_reg_write() 2019-10-02 14:20:22 -07:00