Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Mar 2010 22:50:18 +0000 (14:50 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Mar 2010 22:50:18 +0000 (14:50 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (108 commits)
  bridge: ensure to unlock in error path in br_multicast_query().
  drivers/net/tulip/eeprom.c: fix bogus "(null)" in tulip init messages
  sky2: Avoid rtnl_unlock without rtnl_lock
  ipv6: Send netlink notification when DAD fails
  drivers/net/tg3.c: change the field used with the TG3_FLAG_10_100_ONLY constant
  ipconfig: Handle devices which take some time to come up.
  mac80211: Fix memory leak in ieee80211_if_write()
  mac80211: Fix (dynamic) power save entry
  ipw2200: use kmalloc for large local variables
  ath5k: read eeprom IQ calibration values correctly for G mode
  ath5k: fix I/Q calibration (for real)
  ath5k: fix TSF reset
  ath5k: use fixed antenna for tx descriptors
  libipw: split ieee->networks into small pieces
  mac80211: Fix sta_mtx unlocking on insert STA failure path
  rt2x00: remove KSEG1ADDR define from rt2x00soc.h
  net: add ColdFire support to the smc91x driver
  asix: fix setting mac address for AX88772
  ipv6 ip6_tunnel: eliminate unused recursion field from ip6_tnl{}.
  net: Fix dev_mc_add()
  ...

1  2 
MAINTAINERS
drivers/net/cxgb3/cxgb3_main.c
drivers/net/davinci_emac.c
drivers/net/gianfar.c
drivers/net/typhoon.c
drivers/net/wireless/ath/ar9170/main.c
drivers/net/wireless/rt2x00/rt73usb.c
drivers/net/wireless/zd1211rw/zd_mac.c
drivers/s390/net/qeth_core_main.c
net/sunrpc/xprtsock.c

diff --combined MAINTAINERS
index 3341d92ff00290a7775b3090a2e34c7c54037537,c685ee2434156b33cb558809de6598eaba255a6c..47cc449d89d89746b1dba3cda6aae88afe1bf990
@@@ -71,7 -71,6 +71,7 @@@ Descriptions of section entries
        M: Mail patches to: FullName <address@domain>
        L: Mailing list that is relevant to this area
        W: Web-page with status/info
 +      Q: Patchwork web based patch tracking system site
        T: SCM tree type and location.  Type is one of: git, hg, quilt, stgit.
        S: Status, one of the following:
           Supported:   Someone is actually paid to look after this.
@@@ -183,7 -182,6 +183,7 @@@ M: Ron Minnich <rminnich@sandia.gov
  M:    Latchesar Ionkov <lucho@ionkov.net>
  L:    v9fs-developer@lists.sourceforge.net
  W:    http://swik.net/v9fs
 +Q:    http://patchwork.kernel.org/project/v9fs-devel/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git
  S:    Maintained
  F:    Documentation/filesystems/9p.txt
@@@ -240,7 -238,6 +240,7 @@@ ACP
  M:    Len Brown <lenb@kernel.org>
  L:    linux-acpi@vger.kernel.org
  W:    http://www.lesswatts.org/projects/acpi/
 +Q:    http://patchwork.kernel.org/project/linux-acpi/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
  S:    Supported
  F:    drivers/acpi/
@@@ -431,6 -428,7 +431,6 @@@ P: Jordan Crous
  L:    linux-geode@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html
  S:    Supported
 -F:    arch/x86/kernel/geode_32.c
  F:    drivers/char/hw_random/geode-rng.c
  F:    drivers/crypto/geode*
  F:    drivers/video/geode/
@@@ -666,12 -664,6 +666,12 @@@ T:       git://git.pengutronix.de/git/imx/lin
  F:    arch/arm/mach-mx*/
  F:    arch/arm/plat-mxc/
  
 +ARM/FREESCALE IMX51
 +M:    Amit Kucheria <amit.kucheria@canonical.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-mx5/
 +
  ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -945,16 -937,6 +945,16 @@@ W:       http://www.fluff.org/ben/linux
  S:    Maintained
  F:    arch/arm/mach-s3c6410/
  
 +ARM/SHMOBILE ARM ARCHITECTURE
 +M:    Paul Mundt <lethal@linux-sh.org>
 +M:    Magnus Damm <magnus.damm@gmail.com>
 +L:    linux-sh@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git
 +W:    http://oss.renesas.com
 +S:    Supported
 +F:    arch/arm/mach-shmobile/
 +F:    drivers/sh/
 +
  ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -984,13 -966,6 +984,13 @@@ W:       http://www.arm.linux.org.uk
  S:    Maintained
  F:    arch/arm/vfp/
  
 +ASC7621 HARDWARE MONITOR DRIVER
 +M:    George Joseph <george.joseph@fairview5.com>
 +L:    lm-sensors@lm-sensors.org
 +S:    Maintained
 +F:    Documentation/hwmon/asc7621
 +F:    drivers/hwmon/asc7621.c
 +
  ASUS ACPI EXTRAS DRIVER
  M:    Corentin Chary <corentincj@iksaif.net>
  M:    Karol Kozimor <sziwan@users.sourceforge.net>
@@@ -1251,13 -1226,6 +1251,13 @@@ W:    http://blackfin.uclinux.or
  S:    Supported
  F:    drivers/rtc/rtc-bfin.c
  
 +BLACKFIN SDH DRIVER
 +M:    Cliff Cai <cliff.cai@analog.com>
 +L:    uclinux-dist-devel@blackfin.uclinux.org
 +W:    http://blackfin.uclinux.org
 +S:    Supported
 +F:    drivers/mmc/host/bfin_sdh.c
 +
  BLACKFIN SERIAL DRIVER
  M:    Sonic Zhang <sonic.zhang@analog.com>
  L:    uclinux-dist-devel@blackfin.uclinux.org
@@@ -1364,7 -1332,6 +1364,7 @@@ BTRFS FILE SYSTE
  M:    Chris Mason <chris.mason@oracle.com>
  L:    linux-btrfs@vger.kernel.org
  W:    http://btrfs.wiki.kernel.org/
 +Q:    http://patchwork.kernel.org/project/linux-btrfs/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable.git
  S:    Maintained
  F:    Documentation/filesystems/btrfs.txt
@@@ -1405,20 -1372,30 +1405,30 @@@ F:   arch/x86/include/asm/calgary.
  F:    arch/x86/include/asm/tce.h
  
  CAN NETWORK LAYER
- M:    Urs Thuermann <urs.thuermann@volkswagen.de>
+ M:    Oliver Hartkopp <socketcan@hartkopp.net>
  M:    Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
- L:    socketcan-core@lists.berlios.de (subscribers-only)
+ M:    Urs Thuermann <urs.thuermann@volkswagen.de>
+ L:    socketcan-core@lists.berlios.de
+ L:    netdev@vger.kernel.org
  W:    http://developer.berlios.de/projects/socketcan/
  S:    Maintained
- F:    drivers/net/can/
- F:    include/linux/can/
+ F:    net/can/
  F:    include/linux/can.h
+ F:    include/linux/can/core.h
+ F:    include/linux/can/bcm.h
+ F:    include/linux/can/raw.h
  
  CAN NETWORK DRIVERS
  M:    Wolfgang Grandegger <wg@grandegger.com>
- L:    socketcan-core@lists.berlios.de (subscribers-only)
+ L:    socketcan-core@lists.berlios.de
+ L:    netdev@vger.kernel.org
  W:    http://developer.berlios.de/projects/socketcan/
  S:    Maintained
+ F:    drivers/net/can/
+ F:    include/linux/can/dev.h
+ F:    include/linux/can/error.h
+ F:    include/linux/can/netlink.h
+ F:    include/linux/can/platform/
  
  CELL BROADBAND ENGINE ARCHITECTURE
  M:    Arnd Bergmann <arnd@arndb.de>
@@@ -1529,7 -1506,6 +1539,7 @@@ M:      Steve French <sfrench@samba.org
  L:    linux-cifs-client@lists.samba.org (moderated for non-subscribers)
  L:    samba-technical@lists.samba.org (moderated for non-subscribers)
  W:    http://linux-cifs.samba.org/
 +Q:    http://patchwork.ozlabs.org/project/linux-cifs-client/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
  S:    Supported
  F:    Documentation/filesystems/cifs.txt
@@@ -1816,7 -1792,6 +1826,7 @@@ DEVICE-MAPPER  (LVM
  P:    Alasdair Kergon
  L:    dm-devel@redhat.com
  W:    http://sources.redhat.com/dm
 +Q:    http://patchwork.kernel.org/project/dm-devel/list/
  S:    Maintained
  F:    Documentation/device-mapper/
  F:    drivers/md/dm*
@@@ -2130,6 -2105,7 +2140,7 @@@ F:      drivers/net/eexpress.
  ETHERNET BRIDGE
  M:    Stephen Hemminger <shemminger@linux-foundation.org>
  L:    bridge@lists.linux-foundation.org
+ L:    netdev@vger.kernel.org
  W:    http://www.linux-foundation.org/en/Net:Bridge
  S:    Maintained
  F:    include/linux/netfilter_bridge/
@@@ -2161,7 -2137,6 +2172,7 @@@ M:      "Theodore Ts'o" <tytso@mit.edu
  M:    Andreas Dilger <adilger@sun.com>
  L:    linux-ext4@vger.kernel.org
  W:    http://ext4.wiki.kernel.org
 +Q:    http://patchwork.ozlabs.org/project/linux-ext4/list/
  S:    Maintained
  F:    Documentation/filesystems/ext4.txt
  F:    fs/ext4/
@@@ -2538,6 -2513,13 +2549,6 @@@ L:     linux-parisc@vger.kernel.or
  S:    Maintained
  F:    sound/parisc/harmony.*
  
 -HAYES ESP SERIAL DRIVER
 -M:    "Andrew J. Robinson" <arobinso@nyx.net>
 -W:    http://www.nyx.net/~arobinso
 -S:    Maintained
 -F:    Documentation/serial/hayes-esp.txt
 -F:    drivers/char/esp.c
 -
  HEWLETT-PACKARD SMART2 RAID DRIVER
  M:    Chirag Kantharia <chirag.kantharia@hp.com>
  L:    iss_storagedev@hp.com
@@@ -2746,7 -2728,6 +2757,7 @@@ F:      drivers/scsi/ips.
  IDE SUBSYSTEM
  M:    "David S. Miller" <davem@davemloft.net>
  L:    linux-ide@vger.kernel.org
 +Q:    http://patchwork.ozlabs.org/project/linux-ide/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git
  S:    Maintained
  F:    Documentation/ide/
@@@ -2801,7 -2782,6 +2812,7 @@@ M:      Sean Hefty <sean.hefty@intel.com
  M:    Hal Rosenstock <hal.rosenstock@gmail.com>
  L:    linux-rdma@vger.kernel.org
  W:    http://www.openib.org/
 +Q:    http://patchwork.kernel.org/project/linux-rdma/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git
  S:    Supported
  F:    Documentation/infiniband/
@@@ -2821,13 -2801,12 +2832,13 @@@ INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCH
  M:    Dmitry Torokhov <dmitry.torokhov@gmail.com>
  M:    Dmitry Torokhov <dtor@mail.ru>
  L:    linux-input@vger.kernel.org
 +Q:    http://patchwork.kernel.org/project/linux-input/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git
  S:    Maintained
  F:    drivers/input/
  
  INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)
 -M:    Sylvain Meyer <sylvain.meyer@worldonline.fr>
 +M:    Maik Broemme <mbroemme@plusserver.de>
  L:    linux-fbdev@vger.kernel.org
  S:    Maintained
  F:    Documentation/fb/intelfb.txt
@@@ -3078,13 -3057,6 +3089,13 @@@ W:    http://www.melware.d
  S:    Maintained
  F:    drivers/isdn/hardware/eicon/
  
 +IT87 HARDWARE MONITORING DRIVER
 +M:    Jean Delvare <khali@linux-fr.org>
 +L:    lm-sensors@lm-sensors.org
 +S:    Maintained
 +F:    Documentation/hwmon/it87
 +F:    drivers/hwmon/it87.c
 +
  IVTV VIDEO4LINUX DRIVER
  M:    Andy Walls <awalls@radix.net>
  L:    ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
@@@ -3138,7 -3110,6 +3149,7 @@@ F:      drivers/hwmon/k8temp.
  KCONFIG
  M:    Roman Zippel <zippel@linux-m68k.org>
  L:    linux-kbuild@vger.kernel.org
 +Q:    http://patchwork.kernel.org/project/linux-kbuild/list/
  S:    Maintained
  F:    Documentation/kbuild/kconfig-language.txt
  F:    scripts/kconfig/
@@@ -3213,7 -3184,7 +3224,7 @@@ F:      arch/x86/include/asm/svm.
  F:    arch/x86/kvm/svm.c
  
  KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC
 -M:    Hollis Blanchard <hollisb@us.ibm.com>
 +M:    Alexander Graf <agraf@suse.de>
  L:    kvm-ppc@vger.kernel.org
  W:    http://kvm.qumranet.com
  S:    Supported
@@@ -3352,7 -3323,6 +3363,7 @@@ M:      Benjamin Herrenschmidt <benh@kernel.
  M:    Paul Mackerras <paulus@samba.org>
  W:    http://www.penguinppc.org/
  L:    linuxppc-dev@ozlabs.org
 +Q:    http://patchwork.ozlabs.org/project/linuxppc-dev/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git
  S:    Supported
  F:    Documentation/powerpc/
@@@ -3473,13 -3443,6 +3484,13 @@@ S:    Maintaine
  F:    Documentation/ldm.txt
  F:    fs/partitions/ldm.*
  
 +LogFS
 +M:    Joern Engel <joern@logfs.org>
 +L:    logfs@logfs.org
 +W:    logfs.org
 +S:    Maintained
 +F:    fs/logfs/
 +
  LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
  M:    Eric Moore <Eric.Moore@lsi.com>
  M:    support@lsi.com
@@@ -3616,7 -3579,6 +3627,7 @@@ M:      Mauro Carvalho Chehab <mchehab@infra
  P:    LinuxTV.org Project
  L:    linux-media@vger.kernel.org
  W:    http://linuxtv.org
 +Q:    http://patchwork.kernel.org/project/linux-media/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
  F:    Documentation/dvb/
@@@ -3644,7 -3606,7 +3655,7 @@@ F:      mm
  
  MEMORY RESOURCE CONTROLLER
  M:    Balbir Singh <balbir@linux.vnet.ibm.com>
 -M:    Pavel Emelyanov <xemul@openvz.org>
 +M:    Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
  M:    KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
  L:    linux-mm@kvack.org
  S:    Maintained
@@@ -3652,9 -3614,8 +3663,9 @@@ F:      mm/memcontrol.
  
  MEMORY TECHNOLOGY DEVICES (MTD)
  M:    David Woodhouse <dwmw2@infradead.org>
 -W:    http://www.linux-mtd.infradead.org/
  L:    linux-mtd@lists.infradead.org
 +W:    http://www.linux-mtd.infradead.org/
 +Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
  T:    git git://git.infradead.org/mtd-2.6.git
  S:    Maintained
  F:    drivers/mtd/
@@@ -3914,7 -3875,6 +3925,7 @@@ S:      Maintaine
  NETWORKING [WIRELESS]
  M:    "John W. Linville" <linville@tuxdriver.com>
  L:    linux-wireless@vger.kernel.org
 +Q:    http://patchwork.kernel.org/project/linux-wireless/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
  S:    Maintained
  F:    net/mac80211/
@@@ -4007,7 -3967,6 +4018,7 @@@ M:      Tony Lindgren <tony@atomide.com
  L:    linux-omap@vger.kernel.org
  W:    http://www.muru.com/linux/omap/
  W:    http://linux.omap.com/
 +Q:    http://patchwork.kernel.org/project/linux-omap/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
  S:    Maintained
  F:    arch/arm/*omap*/
@@@ -4234,7 -4193,6 +4245,7 @@@ M:      Helge Deller <deller@gmx.de
  M:    "James E.J. Bottomley" <jejb@parisc-linux.org>
  L:    linux-parisc@vger.kernel.org
  W:    http://www.parisc-linux.org/
 +Q:    http://patchwork.kernel.org/project/linux-parisc/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git
  S:    Maintained
  F:    arch/parisc/
@@@ -4277,7 -4235,6 +4288,7 @@@ F:      Documentation/powerpc/eeh-pci-error-
  PCI SUBSYSTEM
  M:    Jesse Barnes <jbarnes@virtuousgeek.org>
  L:    linux-pci@vger.kernel.org
 +Q:    http://patchwork.kernel.org/project/linux-pci/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git
  S:    Supported
  F:    Documentation/PCI/
@@@ -4316,13 -4273,10 +4327,13 @@@ PERFORMANCE EVENTS SUBSYSTE
  M:    Peter Zijlstra <a.p.zijlstra@chello.nl>
  M:    Paul Mackerras <paulus@samba.org>
  M:    Ingo Molnar <mingo@elte.hu>
 +M:    Arnaldo Carvalho de Melo <acme@redhat.com>
  S:    Supported
  F:    kernel/perf_event.c
  F:    include/linux/perf_event.h
 -F:    arch/*/*/kernel/perf_event.c
 +F:    arch/*/kernel/perf_event.c
 +F:    arch/*/kernel/*/perf_event.c
 +F:    arch/*/kernel/*/*/perf_event.c
  F:    arch/*/include/asm/perf_event.h
  F:    arch/*/lib/perf_event.c
  F:    arch/*/kernel/perf_callchain.c
@@@ -4519,13 -4473,6 +4530,13 @@@ L:    linux-arm-kernel@lists.infradead.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
  S:    Maintained
  
 +MMP2 SUPPORT (aka ARMADA610)
 +M:    Haojian Zhuang <haojian.zhuang@marvell.com>
 +M:    Eric Miao <eric.y.miao@gmail.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
 +S:    Maintained
 +
  PXA MMCI DRIVER
  S:    Orphan
  
@@@ -4663,7 -4610,6 +4674,7 @@@ F:      include/linux/rtc.
  REAL TIME CLOCK (RTC) SUBSYSTEM
  M:    Alessandro Zummo <a.zummo@towertech.it>
  L:    rtc-linux@googlegroups.com
 +Q:    http://patchwork.ozlabs.org/project/rtc-linux/list/
  S:    Maintained
  F:    Documentation/rtc.txt
  F:    drivers/rtc/
@@@ -5031,7 -4977,6 +5042,7 @@@ F:      drivers/*/*/*s3c2410
  TI DAVINCI MACHINE SUPPORT
  P:    Kevin Hilman
  M:    davinci-linux-open-source@linux.davincidsp.com
 +Q:    http://patchwork.kernel.org/project/linux-davinci/list/
  S:    Supported
  F:    arch/arm/mach-davinci
  
@@@ -5197,7 -5142,6 +5208,7 @@@ F:      include/sound/soc
  SPARC + UltraSPARC (sparc/sparc64)
  M:    "David S. Miller" <davem@davemloft.net>
  L:    sparclinux@vger.kernel.org
 +Q:    http://patchwork.ozlabs.org/project/sparclinux/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git
  S:    Maintained
@@@ -5213,7 -5157,6 +5224,7 @@@ SPI SUBSYSTE
  M:    David Brownell <dbrownell@users.sourceforge.net>
  M:    Grant Likely <grant.likely@secretlab.ca>
  L:    spi-devel-general@lists.sourceforge.net
 +Q:    http://patchwork.kernel.org/project/spi-devel-general/list/
  S:    Maintained
  F:    Documentation/spi/
  F:    drivers/spi/
@@@ -5269,7 -5212,7 +5280,7 @@@ F:      drivers/net/starfire
  
  STARMODE RADIO IP (STRIP) PROTOCOL DRIVER
  S:    Orphan
 -F:    drivers/net/wireless/strip.c
 +F:    drivers/staging/strip/strip.c
  F:    include/linux/if_strip.h
  
  STRADIS MPEG-2 DECODER DRIVER
@@@ -5290,7 -5233,6 +5301,7 @@@ SUPER
  M:    Paul Mundt <lethal@linux-sh.org>
  L:    linux-sh@vger.kernel.org
  W:    http://www.linux-sh.org
 +Q:    http://patchwork.kernel.org/project/linux-sh/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git
  S:    Supported
  F:    Documentation/sh/
@@@ -6058,7 -6000,7 +6069,7 @@@ L:      linux-wireless@vger.kernel.or
  W:    http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/
  S:    Maintained
  F:    Documentation/networking/wavelan.txt
 -F:    drivers/net/wireless/wavelan*
 +F:    drivers/staging/wavelan/
  
  WD7000 SCSI DRIVER
  M:    Miroslav Zagorac <zaga@fly.cc.fer.hr>
@@@ -6166,7 -6108,6 +6177,7 @@@ F:      arch/x86
  X86 PLATFORM DRIVERS
  M:    Matthew Garrett <mjg@redhat.com>
  L:    platform-driver-x86@vger.kernel.org
 +T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86.git
  S:    Maintained
  F:    drivers/platform/x86
  
@@@ -6254,7 -6195,6 +6265,7 @@@ F:      drivers/serial/zs.
  THE REST
  M:    Linus Torvalds <torvalds@linux-foundation.org>
  L:    linux-kernel@vger.kernel.org
 +Q:    http://patchwork.kernel.org/project/LKML/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
  S:    Buried alive in reporters
  F:    *
index 3e453e1d97e72ff4b07d040fb7793ae57737d387,cecdec1551db6eb485da32c39b87add1390c63f7..9e3e8750b46a69dcbcead02cb0281c0d4fd084be
@@@ -45,7 -45,6 +45,7 @@@
  #include <linux/firmware.h>
  #include <linux/log2.h>
  #include <linux/stringify.h>
 +#include <linux/sched.h>
  #include <asm/uaccess.h>
  
  #include "common.h"
@@@ -141,7 -140,7 +141,7 @@@ MODULE_PARM_DESC(ofld_disable, "whethe
   * will block keventd as it needs the rtnl lock, and we'll deadlock waiting
   * for our work to complete.  Get our own work queue to solve this.
   */
 -static struct workqueue_struct *cxgb3_wq;
 +struct workqueue_struct *cxgb3_wq;
  
  /**
   *    link_report - show link status and link speed/duplex
@@@ -587,19 -586,6 +587,19 @@@ static void setup_rss(struct adapter *a
                      V_RRCPLCPUSIZE(6) | F_HASHTOEPLITZ, cpus, rspq_map);
  }
  
 +static void ring_dbs(struct adapter *adap)
 +{
 +      int i, j;
 +
 +      for (i = 0; i < SGE_QSETS; i++) {
 +              struct sge_qset *qs = &adap->sge.qs[i];
 +
 +              if (qs->adap)
 +                      for (j = 0; j < SGE_TXQ_PER_SET; j++)
 +                              t3_write_reg(adap, A_SG_KDOORBELL, F_SELEGRCNTX | V_EGRCNTX(qs->txq[j].cntxt_id));
 +      }
 +}
 +
  static void init_napi(struct adapter *adap)
  {
        int i;
@@@ -1294,6 -1280,7 +1294,7 @@@ static void cxgb_down(struct adapter *a
  
        free_irq_resources(adapter);
        quiesce_rx(adapter);
+       t3_sge_stop(adapter);
        flush_workqueue(cxgb3_wq);      /* wait for external IRQ handler */
  }
  
@@@ -2764,42 -2751,6 +2765,42 @@@ static void t3_adap_check_task(struct w
        spin_unlock_irq(&adapter->work_lock);
  }
  
 +static void db_full_task(struct work_struct *work)
 +{
 +      struct adapter *adapter = container_of(work, struct adapter,
 +                                             db_full_task);
 +
 +      cxgb3_event_notify(&adapter->tdev, OFFLOAD_DB_FULL, 0);
 +}
 +
 +static void db_empty_task(struct work_struct *work)
 +{
 +      struct adapter *adapter = container_of(work, struct adapter,
 +                                             db_empty_task);
 +
 +      cxgb3_event_notify(&adapter->tdev, OFFLOAD_DB_EMPTY, 0);
 +}
 +
 +static void db_drop_task(struct work_struct *work)
 +{
 +      struct adapter *adapter = container_of(work, struct adapter,
 +                                             db_drop_task);
 +      unsigned long delay = 1000;
 +      unsigned short r;
 +
 +      cxgb3_event_notify(&adapter->tdev, OFFLOAD_DB_DROP, 0);
 +
 +      /*
 +       * Sleep a while before ringing the driver qset dbs.
 +       * The delay is between 1000-2023 usecs.
 +       */
 +      get_random_bytes(&r, 2);
 +      delay += r & 1023;
 +      set_current_state(TASK_UNINTERRUPTIBLE);
 +      schedule_timeout(usecs_to_jiffies(delay));
 +      ring_dbs(adapter);
 +}
 +
  /*
   * Processes external (PHY) interrupts in process context.
   */
@@@ -3268,11 -3219,6 +3269,11 @@@ static int __devinit init_one(struct pc
        INIT_LIST_HEAD(&adapter->adapter_list);
        INIT_WORK(&adapter->ext_intr_handler_task, ext_intr_task);
        INIT_WORK(&adapter->fatal_error_handler_task, fatal_error_task);
 +
 +      INIT_WORK(&adapter->db_full_task, db_full_task);
 +      INIT_WORK(&adapter->db_empty_task, db_empty_task);
 +      INIT_WORK(&adapter->db_drop_task, db_drop_task);
 +
        INIT_DELAYED_WORK(&adapter->adap_check_task, t3_adap_check_task);
  
        for (i = 0; i < ai->nports0 + ai->nports1; ++i) {
index 13f9869927e3a68deee2e9b35f4b3b360077551c,32960b9b02ae0ba96b539d88cddda617125e8da0..8bd086aee56dc02144ba68b4ab2d958a7783c5c8
@@@ -2385,7 -2385,7 +2385,7 @@@ static int emac_dev_open(struct net_dev
        struct emac_priv *priv = netdev_priv(ndev);
  
        netif_carrier_off(ndev);
-       for (cnt = 0; cnt <= ETH_ALEN; cnt++)
+       for (cnt = 0; cnt < ETH_ALEN; cnt++)
                ndev->dev_addr[cnt] = priv->mac_addr[cnt];
  
        /* Configuration items */
@@@ -2658,7 -2658,7 +2658,7 @@@ static int __devinit davinci_emac_probe
  
        pdata = pdev->dev.platform_data;
        if (!pdata) {
 -              printk(KERN_ERR "DaVinci EMAC: No platfrom data\n");
 +              printk(KERN_ERR "DaVinci EMAC: No platform data\n");
                return -ENODEV;
        }
  
diff --combined drivers/net/gianfar.c
index 61a7b4351e7837dc77cf7fdc2193491fbe492e07,c3f061957c04eabef82fc59107c28e0bddeb9899..b6715553cf173e44bb5dc86be57745ed12009b1b
@@@ -998,7 -998,7 +998,7 @@@ static int gfar_probe(struct of_device 
        }
  
        /* Need to reverse the bit maps as  bit_map's MSB is q0
 -       * but, for_each_bit parses from right to left, which
 +       * but, for_each_set_bit parses from right to left, which
         * basically reverses the queue numbers */
        for (i = 0; i< priv->num_grps; i++) {
                priv->gfargrp[i].tx_bit_map = reverse_bitmap(
         * also assign queues to groups */
        for (grp_idx = 0; grp_idx < priv->num_grps; grp_idx++) {
                priv->gfargrp[grp_idx].num_rx_queues = 0x0;
 -              for_each_bit(i, &priv->gfargrp[grp_idx].rx_bit_map,
 +              for_each_set_bit(i, &priv->gfargrp[grp_idx].rx_bit_map,
                                priv->num_rx_queues) {
                        priv->gfargrp[grp_idx].num_rx_queues++;
                        priv->rx_queue[i]->grp = &priv->gfargrp[grp_idx];
                        rqueue = rqueue | ((RQUEUE_EN0 | RQUEUE_EX0) >> i);
                }
                priv->gfargrp[grp_idx].num_tx_queues = 0x0;
 -              for_each_bit (i, &priv->gfargrp[grp_idx].tx_bit_map,
 +              for_each_set_bit(i, &priv->gfargrp[grp_idx].tx_bit_map,
                                priv->num_tx_queues) {
                        priv->gfargrp[grp_idx].num_tx_queues++;
                        priv->tx_queue[i]->grp = &priv->gfargrp[grp_idx];
@@@ -1709,7 -1709,7 +1709,7 @@@ void gfar_configure_coalescing(struct g
  
        if (priv->mode == MQ_MG_MODE) {
                baddr = &regs->txic0;
 -              for_each_bit (i, &tx_mask, priv->num_tx_queues) {
 +              for_each_set_bit(i, &tx_mask, priv->num_tx_queues) {
                        if (likely(priv->tx_queue[i]->txcoalescing)) {
                                gfar_write(baddr + i, 0);
                                gfar_write(baddr + i, priv->tx_queue[i]->txic);
                }
  
                baddr = &regs->rxic0;
 -              for_each_bit (i, &rx_mask, priv->num_rx_queues) {
 +              for_each_set_bit(i, &rx_mask, priv->num_rx_queues) {
                        if (likely(priv->rx_queue[i]->rxcoalescing)) {
                                gfar_write(baddr + i, 0);
                                gfar_write(baddr + i, priv->rx_queue[i]->rxic);
@@@ -2021,7 -2021,6 +2021,6 @@@ static int gfar_start_xmit(struct sk_bu
        }
  
        /* setup the TxBD length and buffer pointer for the first BD */
-       tx_queue->tx_skbuff[tx_queue->skb_curtx] = skb;
        txbdp_start->bufPtr = dma_map_single(&priv->ofdev->dev, skb->data,
                        skb_headlen(skb), DMA_TO_DEVICE);
  
  
        txbdp_start->lstatus = lstatus;
  
+       eieio(); /* force lstatus write before tx_skbuff */
+       tx_queue->tx_skbuff[tx_queue->skb_curtx] = skb;
        /* Update the current skb pointer to the next entry we will use
         * (wrapping if necessary) */
        tx_queue->skb_curtx = (tx_queue->skb_curtx + 1) &
@@@ -2607,7 -2610,7 +2610,7 @@@ static int gfar_poll(struct napi_struc
                budget_per_queue = left_over_budget/num_queues;
                left_over_budget = 0;
  
 -              for_each_bit(i, &gfargrp->rx_bit_map, priv->num_rx_queues) {
 +              for_each_set_bit(i, &gfargrp->rx_bit_map, priv->num_rx_queues) {
                        if (test_bit(i, &serviced_queues))
                                continue;
                        rx_queue = priv->rx_queue[i];
diff --combined drivers/net/typhoon.c
index 2fbf15235c05ac8ee95a31669bc0315722a0b6b2,1cf012d3e072e000c9a8fefe2eb4f452a6fbdd23..cd24e5f2b2a27944054f9ee4192910a81ab01795
@@@ -480,7 -480,7 +480,7 @@@ typhoon_hello(struct typhoon *tp
                typhoon_inc_cmd_index(&ring->lastWrite, 1);
  
                INIT_COMMAND_NO_RESPONSE(cmd, TYPHOON_CMD_HELLO_RESP);
-               smp_wmb();
+               wmb();
                iowrite32(ring->lastWrite, tp->ioaddr + TYPHOON_REG_CMD_READY);
                spin_unlock(&tp->command_lock);
        }
@@@ -1311,13 -1311,15 +1311,15 @@@ typhoon_init_interface(struct typhoon *
  
        tp->txlo_dma_addr = le32_to_cpu(iface->txLoAddr);
        tp->card_state = Sleeping;
-       smp_wmb();
  
        tp->offload = TYPHOON_OFFLOAD_IP_CHKSUM | TYPHOON_OFFLOAD_TCP_CHKSUM;
        tp->offload |= TYPHOON_OFFLOAD_UDP_CHKSUM | TSO_OFFLOAD_ON;
  
        spin_lock_init(&tp->command_lock);
        spin_lock_init(&tp->state_lock);
+       /* Force the writes to the shared memory area out before continuing. */
+       wmb();
  }
  
  static void
@@@ -2096,7 -2098,7 +2098,7 @@@ typhoon_tx_timeout(struct net_device *d
  
        if(typhoon_reset(tp->ioaddr, WaitNoSleep) < 0) {
                netdev_warn(dev, "could not reset in tx timeout\n");
 -              goto truely_dead;
 +              goto truly_dead;
        }
  
        /* If we ever start using the Hi ring, it will need cleaning too */
  
        if(typhoon_start_runtime(tp) < 0) {
                netdev_err(dev, "could not start runtime in tx timeout\n");
 -              goto truely_dead;
 +              goto truly_dead;
          }
  
        netif_wake_queue(dev);
        return;
  
 -truely_dead:
 +truly_dead:
        /* Reset the hardware, and turn off carrier to avoid more timeouts */
        typhoon_reset(tp->ioaddr, NoWait);
        netif_carrier_off(dev);
index 08dc42da0f63f567568fbd50a5f323ef0f653cdf,f4650fcdebc98b2b3917b257226d30720be9bf1d..257c734733d1d362a6290631075b790bc17b9fc5
@@@ -394,7 -394,7 +394,7 @@@ static void ar9170_tx_fake_ampdu_status
                ieee80211_tx_status_irqsafe(ar->hw, skb);
        }
  
 -      for_each_bit(i, &queue_bitmap, BITS_PER_BYTE) {
 +      for_each_set_bit(i, &queue_bitmap, BITS_PER_BYTE) {
  #ifdef AR9170_QUEUE_STOP_DEBUG
                printk(KERN_DEBUG "%s: wake queue %d\n",
                       wiphy_name(ar->hw->wiphy), i);
@@@ -2512,7 -2512,7 +2512,7 @@@ void *ar9170_alloc(size_t priv_size
        /*
         * this buffer is used for rx stream reconstruction.
         * Under heavy load this device (or the transport layer?)
 -       * tends to split the streams into seperate rx descriptors.
 +       * tends to split the streams into separate rx descriptors.
         */
  
        skb = __dev_alloc_skb(AR9170_MAX_RX_BUFFER_SIZE, GFP_KERNEL);
@@@ -2701,7 -2701,8 +2701,8 @@@ int ar9170_register(struct ar9170 *ar, 
        dev_info(pdev, "Atheros AR9170 is registered as '%s'\n",
                 wiphy_name(ar->hw->wiphy));
  
-       return err;
+       ar->registered = true;
+       return 0;
  
  err_unreg:
        ieee80211_unregister_hw(ar->hw);
@@@ -2712,11 -2713,14 +2713,14 @@@ err_out
  
  void ar9170_unregister(struct ar9170 *ar)
  {
+       if (ar->registered) {
  #ifdef CONFIG_AR9170_LEDS
-       ar9170_unregister_leds(ar);
+               ar9170_unregister_leds(ar);
  #endif /* CONFIG_AR9170_LEDS */
  
-       kfree_skb(ar->rx_failover);
        ieee80211_unregister_hw(ar->hw);
+       }
+       kfree_skb(ar->rx_failover);
        mutex_destroy(&ar->mutex);
  }
index e77aec8d0a840ea37db33d3bc3cae4c904658265,47f3e4a26d77e8d80aa0be3896dc81630f2a5b45..290d70bc5d221a74bd353ad4a5b8feb554959a7d
@@@ -339,7 -339,7 +339,7 @@@ static int rt73usb_config_shared_key(st
                 * The driver does not support the IV/EIV generation
                 * in hardware. However it doesn't support the IV/EIV
                 * inside the ieee80211 frame either, but requires it
 -               * to be provided seperately for the descriptor.
 +               * to be provided separately for the descriptor.
                 * rt2x00lib will cut the IV/EIV data out of all frames
                 * given to us by mac80211, but we must tell mac80211
                 * to generate the IV/EIV data.
@@@ -439,7 -439,7 +439,7 @@@ static int rt73usb_config_pairwise_key(
                 * The driver does not support the IV/EIV generation
                 * in hardware. However it doesn't support the IV/EIV
                 * inside the ieee80211 frame either, but requires it
 -               * to be provided seperately for the descriptor.
 +               * to be provided separately for the descriptor.
                 * rt2x00lib will cut the IV/EIV data out of all frames
                 * given to us by mac80211, but we must tell mac80211
                 * to generate the IV/EIV data.
@@@ -1661,7 -1661,7 +1661,7 @@@ static void rt73usb_fill_rxdone(struct 
  
                /*
                 * Hardware has stripped IV/EIV data from 802.11 frame during
 -               * decryption. It has provided the data seperately but rt2x00lib
 +               * decryption. It has provided the data separately but rt2x00lib
                 * should decide if it should be reinserted.
                 */
                rxdesc->flags |= RX_FLAG_IV_STRIPPED;
@@@ -2352,6 -2352,8 +2352,8 @@@ static struct usb_device_id rt73usb_dev
        { USB_DEVICE(0x0411, 0x00f4), USB_DEVICE_DATA(&rt73usb_ops) },
        { USB_DEVICE(0x0411, 0x0116), USB_DEVICE_DATA(&rt73usb_ops) },
        { USB_DEVICE(0x0411, 0x0119), USB_DEVICE_DATA(&rt73usb_ops) },
+       /* CEIVA */
+       { USB_DEVICE(0x178d, 0x02be), USB_DEVICE_DATA(&rt73usb_ops) },
        /* CNet */
        { USB_DEVICE(0x1371, 0x9022), USB_DEVICE_DATA(&rt73usb_ops) },
        { USB_DEVICE(0x1371, 0x9032), USB_DEVICE_DATA(&rt73usb_ops) },
index a22a192031208547627ce594b256a315ebc5d390,e24099613d919071d45be6b247aff19df4506948..00e09e26c826e444dfb9eec223b653012917f8c4
@@@ -350,7 -350,7 +350,7 @@@ static void zd_mac_tx_status(struct iee
        first_idx = info->status.rates[0].idx;
        ZD_ASSERT(0<=first_idx && first_idx<ARRAY_SIZE(zd_retry_rates));
        retries = &zd_retry_rates[first_idx];
-       ZD_ASSERT(0<=retry && retry<=retries->count);
+       ZD_ASSERT(1 <= retry && retry <= retries->count);
  
        info->status.rates[0].idx = retries->rate[0];
        info->status.rates[0].count = 1; // (retry > 1 ? 2 : 1);
                info->status.rates[i].count = 1; // ((i==retry-1) && success ? 1:2);
        }
        for (; i<IEEE80211_TX_MAX_RATES && i<retry; i++) {
-               info->status.rates[i].idx = retries->rate[retry-1];
+               info->status.rates[i].idx = retries->rate[retry - 1];
                info->status.rates[i].count = 1; // (success ? 1:2);
        }
        if (i<IEEE80211_TX_MAX_RATES)
   * zd_mac_tx_failed - callback for failed frames
   * @dev: the mac80211 wireless device
   *
 - * This function is called if a frame couldn't be successfully be
 + * This function is called if a frame couldn't be successfully
   * transferred. The first frame from the tx queue, will be selected and
   * reported as error to the upper layers.
   */
@@@ -424,12 -424,10 +424,10 @@@ void zd_mac_tx_failed(struct urb *urb
                first_idx = info->status.rates[0].idx;
                ZD_ASSERT(0<=first_idx && first_idx<ARRAY_SIZE(zd_retry_rates));
                retries = &zd_retry_rates[first_idx];
-               if (retry < 0 || retry > retries->count) {
+               if (retry <= 0 || retry > retries->count)
                        continue;
-               }
  
-               ZD_ASSERT(0<=retry && retry<=retries->count);
-               final_idx = retries->rate[retry-1];
+               final_idx = retries->rate[retry - 1];
                final_rate = zd_rates[final_idx].hw_value;
  
                if (final_rate != tx_status->rate) {
index 7d25bdd443cd482a90ce184ba95a8ebec9900813,c9f5af5fe9f0e361c851da23c58f34aff7deab0b..3bd4206f347090fa793e1d67da31c1f22f3c1693
@@@ -537,7 -537,8 +537,8 @@@ static void qeth_send_control_data_cb(s
                        dev_err(&card->gdev->dev,
                                "The qeth device is not configured "
                                "for the OSI layer required by z/VM\n");
-               qeth_schedule_recovery(card);
+               else
+                       qeth_schedule_recovery(card);
                goto out;
        }
  
@@@ -1113,8 -1114,6 +1114,6 @@@ static int qeth_setup_card(struct qeth_
        card->ipato.enabled = 0;
        card->ipato.invert4 = 0;
        card->ipato.invert6 = 0;
-       if (card->info.type == QETH_CARD_TYPE_IQD)
-               card->options.checksum_type = NO_CHECKSUMMING;
        /* init QDIO stuff */
        qeth_init_qdio_info(card);
        return 0;
@@@ -3805,6 -3804,9 +3804,6 @@@ static int qeth_qdio_establish(struct q
        init_data.input_handler          = card->discipline.input_handler;
        init_data.output_handler         = card->discipline.output_handler;
        init_data.int_parm               = (unsigned long) card;
 -      init_data.flags                  = QDIO_INBOUND_0COPY_SBALS |
 -                                         QDIO_OUTBOUND_0COPY_SBALS |
 -                                         QDIO_USE_OUTBOUND_PCIS;
        init_data.input_sbal_addr_array  = (void **) in_sbal_ptrs;
        init_data.output_sbal_addr_array = (void **) out_sbal_ptrs;
  
diff --combined net/sunrpc/xprtsock.c
index 712412982ceef0b8e7c0eb0752fe50b97e133294,4f55ab7ec1b1fdbad401519eda1c68627027e108..75ab08eac66b2166cc54c9e30237544b4c9a4a4d
@@@ -297,12 -297,11 +297,11 @@@ static void xs_format_common_peer_addre
        switch (sap->sa_family) {
        case AF_INET:
                sin = xs_addr_in(xprt);
-               (void)snprintf(buf, sizeof(buf), "%02x%02x%02x%02x",
-                                       NIPQUAD(sin->sin_addr.s_addr));
+               snprintf(buf, sizeof(buf), "%08x", ntohl(sin->sin_addr.s_addr));
                break;
        case AF_INET6:
                sin6 = xs_addr_in6(xprt);
-               (void)snprintf(buf, sizeof(buf), "%pi6", &sin6->sin6_addr);
+               snprintf(buf, sizeof(buf), "%pi6", &sin6->sin6_addr);
                break;
        default:
                BUG();
@@@ -315,10 -314,10 +314,10 @@@ static void xs_format_common_peer_ports
        struct sockaddr *sap = xs_addr(xprt);
        char buf[128];
  
-       (void)snprintf(buf, sizeof(buf), "%u", rpc_get_port(sap));
+       snprintf(buf, sizeof(buf), "%u", rpc_get_port(sap));
        xprt->address_strings[RPC_DISPLAY_PORT] = kstrdup(buf, GFP_KERNEL);
  
-       (void)snprintf(buf, sizeof(buf), "%4hx", rpc_get_port(sap));
+       snprintf(buf, sizeof(buf), "%4hx", rpc_get_port(sap));
        xprt->address_strings[RPC_DISPLAY_HEX_PORT] = kstrdup(buf, GFP_KERNEL);
  }
  
@@@ -1912,11 -1911,6 +1911,11 @@@ static void xs_tcp_setup_socket(struct 
        case -EALREADY:
                xprt_clear_connecting(xprt);
                return;
 +      case -EINVAL:
 +              /* Happens, for instance, if the user specified a link
 +               * local IPv6 address without a scope-id.
 +               */
 +              goto out;
        }
  out_eagain:
        status = -EAGAIN;
@@@ -2105,7 -2099,7 +2104,7 @@@ static void xs_tcp_print_stats(struct r
   * we allocate pages instead doing a kmalloc like rpc_malloc is because we want
   * to use the server side send routines.
   */
 -void *bc_malloc(struct rpc_task *task, size_t size)
 +static void *bc_malloc(struct rpc_task *task, size_t size)
  {
        struct page *page;
        struct rpc_buffer *buf;
  /*
   * Free the space allocated in the bc_alloc routine
   */
 -void bc_free(void *buffer)
 +static void bc_free(void *buffer)
  {
        struct rpc_buffer *buf;