2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-27 06:34:11 +08:00
linux-next/drivers/net/ethernet/8390
Linus Torvalds 06991c28f3 Driver core patches for 3.9-rc1
Here is the big driver core merge for 3.9-rc1
 
 There are two major series here, both of which touch lots of drivers all
 over the kernel, and will cause you some merge conflicts:
   - add a new function called devm_ioremap_resource() to properly be
     able to check return values.
   - remove CONFIG_EXPERIMENTAL
 
 If you need me to provide a merged tree to handle these resolutions,
 please let me know.
 
 Other than those patches, there's not much here, some minor fixes and
 updates.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iEYEABECAAYFAlEmV0cACgkQMUfUDdst+yncCQCfbmnQZju7kzWXk6PjdFuKspT9
 weAAoMCzcAtEzzc4LXuUxxG/sXBVBCjW
 =yWAQ
 -----END PGP SIGNATURE-----

Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core patches from Greg Kroah-Hartman:
 "Here is the big driver core merge for 3.9-rc1

  There are two major series here, both of which touch lots of drivers
  all over the kernel, and will cause you some merge conflicts:

   - add a new function called devm_ioremap_resource() to properly be
     able to check return values.

   - remove CONFIG_EXPERIMENTAL

  Other than those patches, there's not much here, some minor fixes and
  updates"

Fix up trivial conflicts

* tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (221 commits)
  base: memory: fix soft/hard_offline_page permissions
  drivercore: Fix ordering between deferred_probe and exiting initcalls
  backlight: fix class_find_device() arguments
  TTY: mark tty_get_device call with the proper const values
  driver-core: constify data for class_find_device()
  firmware: Ignore abort check when no user-helper is used
  firmware: Reduce ifdef CONFIG_FW_LOADER_USER_HELPER
  firmware: Make user-mode helper optional
  firmware: Refactoring for splitting user-mode helper code
  Driver core: treat unregistered bus_types as having no devices
  watchdog: Convert to devm_ioremap_resource()
  thermal: Convert to devm_ioremap_resource()
  spi: Convert to devm_ioremap_resource()
  power: Convert to devm_ioremap_resource()
  mtd: Convert to devm_ioremap_resource()
  mmc: Convert to devm_ioremap_resource()
  mfd: Convert to devm_ioremap_resource()
  media: Convert to devm_ioremap_resource()
  iommu: Convert to devm_ioremap_resource()
  drm: Convert to devm_ioremap_resource()
  ...
2013-02-21 12:05:51 -08:00
..
8390.c net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
8390.h ethernet: Convert ETHER_ADDR_LEN uses to ETH_ALEN 2011-11-16 20:23:17 -05:00
8390p.c net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
apne.c ethernet: Remove casts to same type 2012-06-06 09:31:33 -07:00
ax88796.c net: phy: remove flags argument from phy_{attach, connect, connect_direct} 2013-01-14 15:11:50 -05:00
axnet_cs.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
etherh.c 8390: remove __dev* attributes 2012-12-03 11:16:32 -08:00
hydra.c drivers/net: fix up function prototypes after __dev* removals 2012-12-07 14:22:22 -05:00
Kconfig Driver core patches for 3.9-rc1 2013-02-21 12:05:51 -08:00
lib8390.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
mac8390.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
Makefile drivers/net: delete the really obsolete 8390 based 10Mbit ISA drivers 2013-01-22 10:39:54 -05:00
mcf8390.c net: add support for NS8390 based eth controllers on some ColdFire CPU boards 2012-07-12 07:54:45 -07:00
ne2k-pci.c remove init of dev->perm_addr in drivers 2013-01-08 18:00:48 -08:00
ne-h8300.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
ne.c ne2000: add the right platform device 2012-11-20 13:48:49 -05:00
pcnet_cs.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
smc-ultra.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
stnic.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
wd.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
zorro8390.c drivers/net: fix up function prototypes after __dev* removals 2012-12-07 14:22:22 -05:00