AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-27 14:05:08 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
0319f30ee7
linux_dsm_epyc7002/drivers/net/ethernet/freescale
History
David S. Miller 06c54055be Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
	net/bridge/br_multicast.c
	net/ipv6/sit.c

The conflicts were minor:

1) sit.c changes overlap with change to ip_tunnel_xmit() signature.

2) br_multicast.c had an overlap between computing max_delay using
   msecs_to_jiffies and turning MLDV2_MRC() into an inline function
   with a name using lowercase instead of uppercase letters.

3) stmmac had two overlapping changes, one which conditionally allocated
   and hooked up a dma_cfg based upon the presence of the pbl OF property,
   and another one handling store-and-forward DMA made.  The latter of
   which should not go into the new of_find_property() basic block.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-09-05 14:58:52 -04:00
..
fs_enet fs_enet: cleanup clock API use 2013-08-22 22:13:54 -07:00
fec_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-09-05 14:58:52 -04:00
fec_mpc52xx_phy.c net: fec_mpc52xx_phy: remove unnecessary dev_set_drvdata() 2013-08-21 12:27:04 -07:00
fec_mpc52xx.c net: ethernet: use platform_{get,set}_drvdata() 2013-05-25 21:27:58 -07:00
fec_mpc52xx.h drivers/net: fix up stale paths from driver reorg 2012-01-30 12:54:40 -05:00
fec_ptp.c fec: Only pass pdev in fec_ptp_init() 2013-06-07 14:41:07 -07:00
fec.h net: fec: fix the error to get the previous BD entry 2013-09-04 14:14:54 -04:00
fsl_pq_mdio.c net: fsl_pq_mdio: remove unnecessary dev_set_drvdata() 2013-08-21 12:27:04 -07:00
gianfar_ethtool.c gianfar: Add flow control support 2013-08-13 15:28:53 -07:00
gianfar_ptp.c net: ethernet: use platform_{get,set}_drvdata() 2013-05-25 21:27:58 -07:00
gianfar_sysfs.c gianfar: Use netdev_<level> when possible 2013-04-14 15:41:49 -04:00
gianfar.c gianfar: Fix reported number of sent bytes to BQL 2013-09-03 22:14:28 -04:00
gianfar.h gianfar: Fix reported number of sent bytes to BQL 2013-09-03 22:14:28 -04:00
Kconfig NET: FEC: dynamtic check DMA desc buff type 2013-01-04 15:15:39 -08:00
Makefile net: fec: build fec.c and fec_ptp.c to one module 2013-03-25 12:14:57 -04:00
ucc_geth_ethtool.c ucc_geth: Convert ugeth_<level> to pr_<level> 2013-04-14 15:41:49 -04:00
ucc_geth.c net: ucc_geth: remove unnecessary dev_set_drvdata() 2013-08-21 12:27:04 -07:00
ucc_geth.h net: remove skb recycling 2012-10-07 00:40:54 -04:00
xgmac_mdio.c net: ethernet: use platform_{get,set}_drvdata() 2013-05-25 21:27:58 -07:00