Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-01 01:31:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
a7e0e4e99f
linux/drivers/net/ethernet/sfc
History
Linus Torvalds 623ff7739e MTD merge for 3.4 
Artem's cleanup of the MTD API continues apace.
 Fixes and improvements for ST FSMC and SuperH FLCTL NAND, amongst others.
 More work on DiskOnChip G3, new driver for DiskOnChip G4.
 Clean up debug/warning printks in JFFS2 to use pr_<level>.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iEYEABECAAYFAk92K6UACgkQdwG7hYl686NrMACfWQJRWasR78MWKfkT2vWZwTFJ
 X5AAoKiSYO2pfo5gWJGOAahNC1zUqMX0
 =i3Vb
 -----END PGP SIGNATURE-----

Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6

Pull MTD changes from David Woodhouse:
 - Artem's cleanup of the MTD API continues apace.
 - Fixes and improvements for ST FSMC and SuperH FLCTL NAND, amongst
   others.
 - More work on DiskOnChip G3, new driver for DiskOnChip G4.
 - Clean up debug/warning printks in JFFS2 to use pr_<level>.

Fix up various trivial conflicts, largely due to changes in calling
conventions for things like dmaengine_prep_slave_sg() (new inline
wrapper to hide new parameter, clashing with rewrite of previously last
parameter that used to be an 'append' flag, and is now a bitmap of
'unsigned long flags').

(Also some header file fallout - like so many merges this merge window -
and silly conflicts with sparse fixes)

* tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6: (120 commits)
  mtd: docg3 add protection against concurrency
  mtd: docg3 refactor cascade floors structure
  mtd: docg3 increase write/erase timeout
  mtd: docg3 fix inbound calculations
  mtd: nand: gpmi: fix function annotations
  mtd: phram: fix section mismatch for phram_setup
  mtd: unify initialization of erase_info->fail_addr
  mtd: support ONFI multi lun NAND
  mtd: sm_ftl: fix typo in major number.
  mtd: add device-tree support to spear_smi
  mtd: spear_smi: Remove default partition information from driver
  mtd: Add device-tree support to fsmc_nand
  mtd: fix section mismatch for doc_probe_device
  mtd: nand/fsmc: Remove sparse warnings and errors
  mtd: nand/fsmc: Add DMA support
  mtd: nand/fsmc: Access the NAND device word by word whenever possible
  mtd: nand/fsmc: Use dev_err to report error scenario
  mtd: nand/fsmc: Use devm routines
  mtd: nand/fsmc: Modify fsmc driver to accept nand timing parameters via platform
  mtd: fsmc_nand: add pm callbacks to support hibernation
  ...
2012-03-30 17:31:56 -07:00
..
bitfield.h sfc: Minor formatting cleanup 2012-02-22 20:48:38 +00:00
efx.c sfc: Log the part number on probe 2012-03-06 18:14:16 +00:00
efx.h sfc: Run event/IRQ self-test asynchronously when interface is brought up 2012-03-06 18:14:15 +00:00
enum.h
ethtool.c sfc: Add SR-IOV back-end support for SFC9000 family 2012-02-16 00:25:13 +00:00
falcon_boards.c sfc: Log the part number on probe 2012-03-06 18:14:16 +00:00
falcon_xmac.c sfc: Merge efx_mac_operations into efx_nic_type 2012-01-27 00:10:46 +00:00
falcon.c sfc: Allocate SRAM between buffer table and descriptor caches at init time 2012-02-16 00:25:12 +00:00
filter.c sfc: Add support for TX MAC filters 2012-02-16 00:11:30 +00:00
filter.h sfc: Add support for TX MAC filters 2012-02-16 00:11:30 +00:00
io.h
Kconfig sfc: Add SR-IOV back-end support for SFC9000 family 2012-02-16 00:25:13 +00:00
Makefile sfc: Add SR-IOV back-end support for SFC9000 family 2012-02-16 00:25:13 +00:00
mcdi_mac.c sfc: Add SR-IOV back-end support for SFC9000 family 2012-02-16 00:25:13 +00:00
mcdi_mon.c sfc: Minor formatting cleanup 2012-02-22 20:48:38 +00:00
mcdi_pcol.h sfc: Update MCDI (firmware interface) definitions 2012-01-09 17:08:16 +00:00
mcdi_phy.c sfc: Update MCDI (firmware interface) definitions 2012-01-09 17:08:16 +00:00
mcdi.c sfc: Add SR-IOV back-end support for SFC9000 family 2012-02-16 00:25:13 +00:00
mcdi.h sfc: Add SR-IOV back-end support for SFC9000 family 2012-02-16 00:25:13 +00:00
mdio_10g.c sfc: Fix some formatting errors reported by checkpatch 2012-01-05 18:44:49 +00:00
mdio_10g.h
mtd.c MTD merge for 3.4 2012-03-30 17:31:56 -07:00
net_driver.h sfc: Remove efx_channel::last_eventq_read_ptr 2012-03-06 18:14:15 +00:00
nic.c sfc: Run event/IRQ self-test asynchronously when interface is brought up 2012-03-06 18:14:15 +00:00
nic.h sfc: Log the part number on probe 2012-03-06 18:14:16 +00:00
phy.h
qt202x_phy.c sfc: Fix some formatting errors reported by checkpatch 2012-01-05 18:44:49 +00:00
regs.h sfc: Correct MAC filter bitfield definitions 2012-02-16 00:11:31 +00:00
rx.c sfc: Update comments on efx_rx_packet_gro() 2012-03-06 18:14:14 +00:00
selftest.c sfc: Run event/IRQ self-test asynchronously when interface is brought up 2012-03-06 18:14:15 +00:00
selftest.h sfc: Run event/IRQ self-test asynchronously when interface is brought up 2012-03-06 18:14:15 +00:00
siena_sriov.c sfc: Fix calculation of vf_i in map_vi_index() 2012-03-06 18:14:13 +00:00
siena.c sfc: Remove redundant function efx_nic_has_mc() 2012-03-06 18:14:13 +00:00
spi.h sfc: Fix some formatting errors reported by checkpatch 2012-01-05 18:44:49 +00:00
tenxpress.c sfc: Fix some formatting errors reported by checkpatch 2012-01-05 18:44:49 +00:00
tx.c sfc: Minor formatting cleanup 2012-02-22 20:48:38 +00:00
txc43128_phy.c sfc: Const-qualify static data as appropriate, partly prompted by checkpatch 2012-01-09 17:08:13 +00:00
vfdi.h sfc: Specify that the VFDI status page has page alignment and size 2012-02-22 20:48:07 +00:00
workarounds.h