AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-14 03:06:42 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
57f2685c16
linux_dsm_epyc7002/drivers/net/ethernet
History
Linus Torvalds 57f2685c16 Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 
* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (53 commits)
  ARM: mach-shmobile: specify CHCLR registers on SH7372
  dma: shdma: fix runtime PM: clear channel buffers on reset
  dma/imx-sdma: save irq flags when use spin_lock in sdma_tx_submit
  dmaengine/ste_dma40: clear LNK on channel startup
  dmaengine: intel_mid_dma: remove legacy pm interface
  ASoC: mxs: correct 'direction' of device_prep_dma_cyclic
  dmaengine: intel_mid_dma: error path fix
  dmaengine: intel_mid_dma: locking and freeing fixes
  mtd: gpmi-nand: move to dma_transfer_direction
  mtd: fix compile error for gpmi-nand
  mmc: mxs-mmc: fix the dma_transfer_direction migration
  dmaengine: add DMA_TRANS_NONE to dma_transfer_direction
  dma: mxs-dma: Don't use CLKGATE bits in CTRL0 to disable DMA channels
  dma: mxs-dma: make mxs_dma_prep_slave_sg() multi user safe
  dma: mxs-dma: Always leave mxs_dma_init() with the clock disabled.
  dma: mxs-dma: fix a typo in comment
  DMA: PL330: Remove pm_runtime_xxx calls from pl330 probe/remove
  video i.MX IPU: Fix display connections
  i.MX IPU DMA: Fix wrong burstsize settings
  dmaengine/ste_dma40: allow fixed physical channel
  ...

Fix up conflicts in drivers/dma/{Kconfig,mxs-dma.c,pl330.c}

The conflicts looked pretty trivial, but I'll ask people to verify them.
2012-01-17 18:40:24 -08:00
..
3com
8390 ax88796: use an unique MDIO bus name. 2012-01-10 16:35:00 -08:00
adaptec net: make vlan ndo_vlan_rx_[add/kill]_vid return error value 2011-12-08 19:52:37 -05:00
adi bfin_mac: use an unique MDIO bus name. 2012-01-10 16:35:00 -08:00
aeroflex net/ethernet: convert drivers/net/ethernet/* to use module_platform_driver() 2011-11-29 00:25:05 -05:00
alteon
amd au1000-eth: use an unique MDIO bus name. 2012-01-10 16:35:00 -08:00
apple
atheros Sweep away N/A fw_version dustbunnies from the .get_drvinfo routine of a number of drivers 2011-11-22 16:43:32 -05:00
broadcom bcm63xx_enet: use an unique MDIO bus name. 2012-01-10 16:35:02 -08:00
brocade bna: fix sparse warnings/errors 2012-01-05 13:23:00 -05:00
cadence macb: use an unique MDIO bus name. 2012-01-10 16:35:00 -08:00
calxeda xgmac: cleanups 2012-01-05 13:23:00 -05:00
chelsio Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-01-08 13:21:22 -08:00
cirrus
cisco net: make vlan ndo_vlan_rx_[add/kill]_vid return error value 2011-12-08 19:52:37 -05:00
davicom Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2011-12-02 13:49:21 -05:00
dec net: fix assignment of 0/1 to bool variables. 2011-12-19 22:27:29 -05:00
dlink module_param: make bool parameters really bool (net & drivers/net) 2011-12-19 22:27:29 -05:00
emulex netdev: make net_device_ops const 2012-01-09 14:05:23 -08:00
faraday
freescale net: fsl: fec: handle 10Mbps speed in RMII mode 2012-01-12 20:05:28 -08:00
fujitsu
hp
i825xx
ibm net: make vlan ndo_vlan_rx_[add/kill]_vid return error value 2011-12-08 19:52:37 -05:00
icplus icplus: mdio_write(), remove unnecessary for loop 2011-12-01 12:54:46 -05:00
intel ixgbe: FCoE: Add support for ndo_get_fcoe_hbainfo() call 2012-01-05 13:12:04 -05:00
marvell pxa168-eth: use an unique MDIO bus name. 2012-01-10 16:35:01 -08:00
mellanox mlx4_core: Elaborating limitation on VF port options 2012-01-03 12:49:16 -05:00
micrel Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-01-17 18:40:24 -08:00
microchip
myricom myri10ge: Fix typo of 'VMware' in comment. 2011-12-19 15:44:43 -05:00
natsemi Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 2012-01-06 18:28:12 -08:00
neterion net: make vlan ndo_vlan_rx_[add/kill]_vid return error value 2011-12-08 19:52:37 -05:00
nuvoton net/ethernet: convert drivers/net/ethernet/* to use module_platform_driver() 2011-11-29 00:25:05 -05:00
nvidia forcedeath: Fix bql support for forcedeath 2011-12-02 12:39:12 -05:00
octeon
oki-semi Sweep away N/A fw_version dustbunnies from the .get_drvinfo routine of a number of drivers 2011-11-22 16:43:32 -05:00
packetengines
pasemi pasemi_mac: Fix building as module 2011-12-06 00:48:59 -05:00
qlogic net: make vlan ndo_vlan_rx_[add/kill]_vid return error value 2011-12-08 19:52:37 -05:00
racal
rdc r6040: fix typo in use of MCR0 register bits 2012-01-07 12:09:36 -08:00
realtek 8139cp: fix missing napi_gro_flush. 2012-01-08 19:20:33 -08:00
renesas sh-eth: use an unique MDIO bus name. 2012-01-10 16:35:01 -08:00
seeq net/ethernet: convert drivers/net/ethernet/* to use module_platform_driver() 2011-11-29 00:25:05 -05:00
sfc sfc: Remove now-unused filter function 2012-01-04 14:10:23 -05:00
sgi net: meth: Add set_rx_mode hook to fix ICMPv6 neighbor discovery 2011-12-27 13:17:34 -05:00
silan
sis Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-01-08 13:21:22 -08:00
smsc smsc911x: use an unique MDIO bus name. 2012-01-10 16:35:01 -08:00
stmicro drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c: add missing iounmap 2012-01-12 20:05:28 -08:00
sun sunhme/PCI: use list_for_each_entry() for bus->devices traversal 2011-12-19 16:13:36 -05:00
tehuti net: make vlan ndo_vlan_rx_[add/kill]_vid return error value 2011-12-08 19:52:37 -05:00
ti davinci_emac: use an unique MDIO bus name. 2012-01-10 16:35:01 -08:00
tile netdev: make net_device_ops const 2012-01-09 14:05:23 -08:00
toshiba powerpc/ps3: Fix hcall lv1_net_stop_rx_dma 2011-12-08 14:05:54 +11:00
tundra drivers/net/ethernet/tundra/tsi108_eth.c: add missing iounmap 2012-01-12 20:05:28 -08:00
via via-rhine: rework suspend and resume. 2012-01-07 23:02:38 +01:00
xilinx net: ethernet: xilinx: Don't use NO_IRQ in xilinx 2011-12-21 15:42:50 -05:00
xircom
xscale ixp4xx-eth: use an unique MDIO bus name. 2012-01-10 16:35:01 -08:00
dnet.c dnet: use an unique MDIO bus name. 2012-01-10 16:35:00 -08:00
dnet.h
ethoc.c net/ethernet: convert drivers/net/ethernet/* to use module_platform_driver() 2011-11-29 00:25:05 -05:00
fealnx.c
jme.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2011-12-02 13:49:21 -05:00
jme.h jme: PHY configuration for compatible issue 2011-11-27 19:21:09 -05:00
Kconfig net: add calxeda xgmac ethernet driver 2011-11-29 01:15:24 -05:00
korina.c net/ethernet: convert drivers/net/ethernet/* to use module_platform_driver() 2011-11-29 00:25:05 -05:00
lantiq_etop.c lantiq_etop: use an unique MDIO bus name. 2012-01-10 16:35:00 -08:00
Makefile Driver specific changes 2012-01-09 14:39:22 -08:00
mipsnet.c
netx-eth.c
s6gmac.c s6gmac: use an unique MDIO bus name. 2012-01-10 16:35:01 -08:00