Merge tag 'fcoe' into fixes

3.10 fixes

diff --combined MAINTAINERS
index 3d7782b9f90d80d171c97e1d15371a9e2ec51ddc,bde678d40e2e03394163f208cffb97fe5026f52e..778fceac27e478c655fb7e806788625d080926f7
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -90,9 -90,6 +90,9 @@@ Descriptions of section entries
           F:   drivers/net/*   all files in drivers/net, but not below
           F:   */net/*         all files in "any top level directory"/net
           One pattern per line.  Multiple F: lines acceptable.
 +      N: Files and directories with regex patterns.
 +         N:   [^a-z]tegra     all files whose path contains the word tegra
 +         One pattern per line.  Multiple N: lines acceptable.
        X: Files and directories that are NOT maintained, same rules as F:
           Files exclusions are tested before file matches.
           Can be useful for excluding a specific subdirectory, for instance:
@@@ -100,12 -97,13 +100,12 @@@
           X:   net/ipv6/
           matches all files in and below net excluding net/ipv6/
        K: Keyword perl extended regex pattern to match content in a
 -         patch or file, or an affected filename.  For instance:
 +         patch or file.  For instance:
           K: of_get_profile
 -            matches patch or file content, or filenames, that contain
 -            "of_get_profile"
 +            matches patches or files that contain "of_get_profile"
           K: \b(printk|pr_(info|err))\b
 -            matches patch or file content, or filenames, that contain one or
 -            more of the words printk, pr_info or pr_err
 +            matches patches or files that contain one or more of the words
 +            printk, pr_info or pr_err
           One regex pattern per line.  Multiple K: lines acceptable.
  
  Note: For the hard of thinking, this list is meant to remain in alphabetical
@@@ -801,7 -799,6 +801,7 @@@ S: Maintaine
  F:    arch/arm/mach-prima2/
  F:    drivers/dma/sirf-dma.c
  F:    drivers/i2c/busses/i2c-sirf.c
 +F:    drivers/mmc/host/sdhci-sirf.c
  F:    drivers/pinctrl/pinctrl-sirf.c
  F:    drivers/spi/spi-sirf.c
  
@@@ -1034,7 -1031,6 +1034,7 @@@ F:      drivers/mmc/host/msm_sdcc.
  F:    drivers/tty/serial/msm_serial.h
  F:    drivers/tty/serial/msm_serial.c
  F:    drivers/*/pm8???-*
 +F:    drivers/ssbi/
  F:    include/linux/mfd/pm8xxx/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git
  S:    Maintained
@@@ -1620,13 -1616,6 +1620,13 @@@ W:    http://www.baycom.org/~tom/ham/ham.h
  S:    Maintained
  F:    drivers/net/hamradio/baycom*
  
 +BCACHE (BLOCK LAYER CACHE)
 +M:    Kent Overstreet <koverstreet@google.com>
 +L:    linux-bcache@vger.kernel.org
 +W:    http://bcache.evilpiepirate.org
 +S:    Maintained:
 +F:    drivers/md/bcache/
 +
  BEFS FILE SYSTEM
  S:    Orphan
  F:    Documentation/filesystems/befs.txt
@@@ -1775,7 -1764,7 +1775,7 @@@ F:      arch/arm/configs/bcm2835_defconfi
  F:    drivers/*/*bcm2835*
  
  BROADCOM TG3 GIGABIT ETHERNET DRIVER
 -M:    Matt Carlson <mcarlson@broadcom.com>
 +M:    Nithin Nayak Sujir <nsujir@broadcom.com>
  M:    Michael Chan <mchan@broadcom.com>
  L:    netdev@vger.kernel.org
  S:    Supported
@@@ -1897,7 -1886,7 +1897,7 @@@ F:      Documentation/video4linux/cafe_cci
  F:    drivers/media/platform/marvell-ccic/
  
  CAIF NETWORK LAYER
 -M:    Sjur Braendeland <sjur.brandeland@stericsson.com>
 +M:    Dmitry Tarnyagin <dmitry.tarnyagin@lockless.no>
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    Documentation/networking/caif/
@@@ -2211,34 -2200,12 +2211,34 @@@ F:   drivers/net/ethernet/ti/cpmac.
  
  CPU FREQUENCY DRIVERS
  M:    Rafael J. Wysocki <rjw@sisk.pl>
 +M:    Viresh Kumar <viresh.kumar@linaro.org>
  L:    cpufreq@vger.kernel.org
  L:    linux-pm@vger.kernel.org
  S:    Maintained
 +T:    git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
  F:    drivers/cpufreq/
  F:    include/linux/cpufreq.h
  
 +CPU FREQUENCY DRIVERS - ARM BIG LITTLE
 +M:    Viresh Kumar <viresh.kumar@linaro.org>
 +M:    Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
 +L:    cpufreq@vger.kernel.org
 +L:    linux-pm@vger.kernel.org
 +W:    http://www.arm.com/products/processors/technologies/biglittleprocessing.php
 +S:    Maintained
 +F:    drivers/cpufreq/arm_big_little.h
 +F:    drivers/cpufreq/arm_big_little.c
 +F:    drivers/cpufreq/arm_big_little_dt.c
 +
 +CPUIDLE DRIVERS
 +M:    Rafael J. Wysocki <rjw@sisk.pl>
 +M:    Daniel Lezcano <daniel.lezcano@linaro.org>
 +L:    linux-pm@vger.kernel.org
 +S:    Maintained
 +T:    git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
 +F:    drivers/cpuidle/*
 +F:    include/linux/cpuidle.h
 +
  CPUID/MSR DRIVER
  M:    "H. Peter Anvin" <hpa@zytor.com>
  S:    Maintained
@@@ -2317,7 -2284,7 +2317,7 @@@ L:      linux-media@vger.kernel.or
  T:    git git://linuxtv.org/media_tree.git
  W:    http://linuxtv.org
  S:    Maintained
 -F:    drivers/media/i2c/cx2341x*
 +F:    drivers/media/common/cx2341x*
  F:    include/media/cx2341x*
  
  CX88 VIDEO4LINUX DRIVER
@@@ -2400,16 -2367,6 +2400,16 @@@ W:    http://www.cyclades.com
  S:    Orphan
  F:    drivers/net/wan/pc300*
  
 +CYPRESS_FIRMWARE MEDIA DRIVER
 +M:    Antti Palosaari <crope@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/common/cypress_firmware*
 +
  CYTTSP TOUCHSCREEN DRIVER
  M:    Javier Martinez Canillas <javier@dowhile0.org>
  L:    linux-input@vger.kernel.org
@@@ -2484,7 -2441,9 +2484,7 @@@ S:      Maintaine
  F:    drivers/platform/x86/dell-laptop.c
  
  DELL LAPTOP SMM DRIVER
 -M:    Massimo Dal Zotto <dz@debian.org>
 -W:    http://www.debian.org/~dz/i8k/
 -S:    Maintained
 +S:    Orphan
  F:    drivers/char/i8k.c
  F:    include/uapi/linux/i8k.h
  
@@@ -2499,12 -2458,6 +2499,12 @@@ M:    Matthew Garrett <mjg59@srcf.ucam.org
  S:    Maintained
  F:    drivers/platform/x86/dell-wmi.c
  
 +DESIGNWARE USB2 DRD IP DRIVER
 +M:    Paul Zimmerman <paulz@synopsys.com>
 +L:    linux-usb@vger.kernel.org
 +S:    Maintained
 +F:    drivers/staging/dwc2/
 +
  DESIGNWARE USB3 DRD IP DRIVER
  M:    Felipe Balbi <balbi@ti.com>
  L:    linux-usb@vger.kernel.org
@@@ -2778,7 -2731,7 +2778,7 @@@ T:      git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/usb/dvb-usb/cxusb*
  
 -DVB_USB_CYPRESS_FIRMWARE MEDIA DRIVER
 +DVB_USB_EC168 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
  W:    http://linuxtv.org/
@@@ -2786,16 -2739,17 +2786,16 @@@ W:   http://palosaari.fi/linux
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/anttip/media_tree.git
  S:    Maintained
 -F:    drivers/media/usb/dvb-usb-v2/cypress_firmware*
 +F:    drivers/media/usb/dvb-usb-v2/ec168*
  
 -DVB_USB_EC168 MEDIA DRIVER
 +DVB_USB_GL861 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
  W:    http://linuxtv.org/
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/anttip/media_tree.git
  S:    Maintained
 -F:    drivers/media/usb/dvb-usb-v2/ec168*
 +F:    drivers/media/usb/dvb-usb-v2/gl861*
  
  DVB_USB_MXL111SF MEDIA DRIVER
  M:    Michael Krufky <mkrufky@linuxtv.org>
@@@ -3033,18 -2987,9 +3033,18 @@@ F:    arch/ia64/kernel/efi.
  F:    arch/x86/boot/compressed/eboot.[ch]
  F:    arch/x86/include/asm/efi.h
  F:    arch/x86/platform/efi/*
 -F:    drivers/firmware/efivars.c
 +F:    drivers/firmware/efi/*
  F:    include/linux/efi*.h
  
 +EFI VARIABLE FILESYSTEM
 +M:    Matthew Garrett <matthew.garrett@nebula.com>
 +M:    Jeremy Kerr <jk@ozlabs.org>
 +M:    Matt Fleming <matt.fleming@intel.com>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git
 +L:    linux-efi@vger.kernel.org
 +S:    Maintained
 +F:    fs/efivarfs/
 +
  EFIFB FRAMEBUFFER DRIVER
  L:    linux-fbdev@vger.kernel.org
  M:    Peter Jones <pjones@redhat.com>
@@@ -3220,7 -3165,7 +3220,7 @@@ F:      lib/fault-inject.
  
  FCOE SUBSYSTEM (libfc, libfcoe, fcoe)
  M:    Robert Love <robert.w.love@intel.com>
- L:    devel@open-fcoe.org
+ L:    fcoe-devel@open-fcoe.org
  W:    www.Open-FCoE.org
  S:    Supported
  F:    drivers/scsi/libfc/
@@@ -3563,7 -3508,7 +3563,7 @@@ F:      drivers/isdn/gigaset
  F:    include/uapi/linux/gigaset_dev.h
  
  GPIO SUBSYSTEM
 -M:    Grant Likely <grant.likely@secretlab.ca>
 +M:    Grant Likely <grant.likely@linaro.org>
  M:    Linus Walleij <linus.walleij@linaro.org>
  S:    Maintained
  T:    git git://git.secretlab.ca/git/linux-2.6.git
@@@ -3648,14 -3593,6 +3648,14 @@@ W:    http://www.kernel.org/pub/linux/kern
  S:    Maintained
  F:    drivers/platform/x86/hdaps.c
  
 +HDPVR USB VIDEO ENCODER DRIVER
 +M:    Hans Verkuil <hverkuil@xs4all.nl>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Odd Fixes
 +F:    drivers/media/usb/hdpvr
 +
  HWPOISON MEMORY FAILURE HANDLING
  M:    Andi Kleen <andi@firstfloor.org>
  L:    linux-mm@kvack.org
@@@ -3927,6 -3864,7 +3927,6 @@@ F:      drivers/i2c/i2c-stub.
  
  I2C SUBSYSTEM
  M:    Wolfram Sang <wsa@the-dreams.de>
 -M:    "Ben Dooks (embedded platforms)" <ben-linux@fluff.org>
  L:    linux-i2c@vger.kernel.org
  W:    http://i2c.wiki.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git
@@@ -4403,7 -4341,7 +4403,7 @@@ F:      drivers/irqchip
  
  IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
  M:    Benjamin Herrenschmidt <benh@kernel.crashing.org>
 -M:    Grant Likely <grant.likely@secretlab.ca>
 +M:    Grant Likely <grant.likely@linaro.org>
  T:    git git://git.secretlab.ca/git/linux-2.6.git irqdomain/next
  S:    Maintained
  F:    Documentation/IRQ-domain.txt
@@@ -4484,16 -4422,6 +4484,16 @@@ Q:    http://patchwork.linuxtv.org/project
  S:    Maintained
  F:    drivers/media/dvb-frontends/it913x-fe*
  
 +IT913X MEDIA DRIVER
 +M:    Antti Palosaari <crope@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/tuners/it913x*
 +
  IVTV VIDEO4LINUX DRIVER
  M:    Andy Walls <awalls@md.metrocast.net>
  L:    ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
@@@ -4900,8 -4828,11 +4900,8 @@@ F:     arch/powerpc/platforms/40x
  F:    arch/powerpc/platforms/44x/
  
  LINUX FOR POWERPC EMBEDDED XILINX VIRTEX
 -M:    Grant Likely <grant.likely@secretlab.ca>
 -W:    http://wiki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex
  L:    linuxppc-dev@lists.ozlabs.org
 -T:    git git://git.secretlab.ca/git/linux-2.6.git
 -S:    Maintained
 +S:    Unmaintained
  F:    arch/powerpc/*/*virtex*
  F:    arch/powerpc/*/*/*virtex*
  
@@@ -5481,13 -5412,6 +5481,13 @@@ L:    linux-scsi@vger.kernel.or
  S:    Maintained
  F:    drivers/scsi/NCR_D700.*
  
 +NCT6775 HARDWARE MONITOR DRIVER
 +M:    Guenter Roeck <linux@roeck-us.net>
 +L:    lm-sensors@lm-sensors.org
 +S:    Maintained
 +F:    Documentation/hwmon/nct6775
 +F:    drivers/hwmon/nct6775.c
 +
  NETEFFECT IWARP RNIC DRIVER (IW_NES)
  M:    Faisal Latif <faisal.latif@intel.com>
  L:    linux-rdma@vger.kernel.org
@@@ -5919,7 -5843,7 +5919,7 @@@ F:      Documentation/i2c/busses/i2c-ocore
  F:    drivers/i2c/busses/i2c-ocores.c
  
  OPEN FIRMWARE AND FLATTENED DEVICE TREE
 -M:    Grant Likely <grant.likely@secretlab.ca>
 +M:    Grant Likely <grant.likely@linaro.org>
  M:    Rob Herring <rob.herring@calxeda.com>
  L:    devicetree-discuss@lists.ozlabs.org (moderated for non-subscribers)
  W:    http://fdt.secretlab.ca
@@@ -6274,7 -6198,7 +6274,7 @@@ S:      Supporte
  F:    drivers/scsi/pmcraid.*
  
  PMC SIERRA PM8001 DRIVER
 -M:    jack_wang@usish.com
 +M:    xjtuwjp@gmail.com
  M:    lindar_liu@usish.com
  L:    linux-scsi@vger.kernel.org
  S:    Supported
@@@ -6407,12 -6331,11 +6407,12 @@@ S:   Maintaine
  T:    git git://git.infradead.org/users/cbou/linux-pstore.git
  F:    fs/pstore/
  F:    include/linux/pstore*
 -F:    drivers/firmware/efivars.c
 +F:    drivers/firmware/efi/efi-pstore.c
  F:    drivers/acpi/apei/erst.c
  
  PTP HARDWARE CLOCK SUPPORT
  M:    Richard Cochran <richardcochran@gmail.com>
 +L:    netdev@vger.kernel.org
  S:    Maintained
  W:    http://linuxptp.sourceforge.net/
  F:    Documentation/ABI/testing/sysfs-ptp
@@@ -6544,7 -6467,6 +6544,7 @@@ S:      Supporte
  F:    drivers/net/ethernet/qlogic/qlcnic/
  
  QLOGIC QLGE 10Gb ETHERNET DRIVER
 +M:    Shahed Shaikh <shahed.shaikh@qlogic.com>
  M:    Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
  M:    Ron Mercer <ron.mercer@qlogic.com>
  M:    linux-driver@qlogic.com
@@@ -6723,14 -6645,6 +6723,14 @@@ F:    drivers/remoteproc
  F:    Documentation/remoteproc.txt
  F:    include/linux/remoteproc.h
  
 +REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM
 +M:    Ohad Ben-Cohen <ohad@wizery.com>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git
 +S:    Maintained
 +F:    drivers/rpmsg/
 +F:    Documentation/rpmsg.txt
 +F:    include/linux/rpmsg.h
 +
  RFKILL
  M:    Johannes Berg <johannes@sipsolutions.net>
  L:    linux-wireless@vger.kernel.org
@@@ -6778,16 -6692,6 +6778,16 @@@ T:    git git://linuxtv.org/anttip/media_t
  S:    Maintained
  F:    drivers/media/dvb-frontends/rtl2830*
  
 +RTL2832 MEDIA DRIVER
 +M:    Antti Palosaari <crope@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/rtl2832*
 +
  RTL8180 WIRELESS DRIVER
  M:    "John W. Linville" <linville@tuxdriver.com>
  L:    linux-wireless@vger.kernel.org
@@@ -6890,7 -6794,7 +6890,7 @@@ L:      linux-media@vger.kernel.or
  W:    http://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Odd fixes
 -F:    Documentation/video4linux/saa7134/
 +F:    Documentation/video4linux/*.saa7134
  F:    drivers/media/pci/saa7134/
  
  SAA7146 VIDEO4LINUX-2 DRIVER
@@@ -6983,8 -6887,9 +6983,8 @@@ F:      drivers/clocksourc
  
  TLG2300 VIDEO4LINUX-2 DRIVER
  M:    Huang Shijie <shijie8@gmail.com>
 -M:    Kang Yong <kangyong@telegent.com>
 -M:    Zhang Xiaobing <xbzhang@telegent.com>
 -S:    Supported
 +M:    Hans Verkuil <hverkuil@xs4all.nl>
 +S:    Odd Fixes
  F:    drivers/media/usb/tlg2300
  
  SC1200 WDT DRIVER
@@@ -7155,9 -7060,9 +7155,9 @@@ F:      drivers/misc/phantom.
  F:    include/uapi/linux/phantom.h
  
  SERIAL ATA (SATA) SUBSYSTEM
 -M:    Jeff Garzik <jgarzik@pobox.com>
 +M:    Tejun Heo <tj@kernel.org>
  L:    linux-ide@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
  S:    Supported
  F:    drivers/ata/
  F:    include/linux/ata.h
@@@ -7230,43 -7135,17 +7230,43 @@@ F:   drivers/media/radio/si470x/radio-si4
  F:    drivers/media/radio/si470x/radio-si470x.h
  F:    drivers/media/radio/si470x/radio-si470x-usb.c
  
 +SI4713 FM RADIO TRANSMITTER I2C DRIVER
 +M:    Eduardo Valentin <edubezval@gmail.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Odd Fixes
 +F:    drivers/media/radio/si4713-i2c.?
 +
 +SI4713 FM RADIO TRANSMITTER PLATFORM DRIVER
 +M:    Eduardo Valentin <edubezval@gmail.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Odd Fixes
 +F:    drivers/media/radio/radio-si4713.h
 +
 +SIANO DVB DRIVER
 +M:    Mauro Carvalho Chehab <mchehab@redhat.com>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Odd fixes
 +F:    drivers/media/common/siano/
 +F:    drivers/media/dvb/siano/
 +F:    drivers/media/usb/siano/
 +F:    drivers/media/mmc/siano
 +
  SH_VEU V4L2 MEM2MEM DRIVER
  M:    Guennadi Liakhovetski <g.liakhovetski@gmx.de>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    drivers/media/platform/sh_veu.c
 -F:    include/media/sh_veu.h
  
  SH_VOU V4L2 OUTPUT DRIVER
  M:    Guennadi Liakhovetski <g.liakhovetski@gmx.de>
  L:    linux-media@vger.kernel.org
 -S:    Maintained
 +S:    Odd Fixes
  F:    drivers/media/platform/sh_vou.c
  F:    include/media/sh_vou.h
  
@@@ -7308,13 -7187,14 +7308,13 @@@ F:   arch/arm/mach-davinc
  F:    drivers/i2c/busses/i2c-davinci.c
  
  TI DAVINCI SERIES MEDIA DRIVER
 -M:    Manjunath Hadli <manjunath.hadli@ti.com>
 -M:    Prabhakar Lad <prabhakar.lad@ti.com>
 +M:    Lad, Prabhakar <prabhakar.csengg@gmail.com>
  L:    linux-media@vger.kernel.org
  L:    davinci-linux-open-source@linux.davincidsp.com (moderated for non-subscribers)
  W:    http://linuxtv.org/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
 -S:    Supported
 +S:    Maintained
  F:    drivers/media/platform/davinci/
  F:    include/media/davinci/
  
@@@ -7587,11 -7467,11 +7587,11 @@@ S:   Maintaine
  F:    drivers/clk/spear/
  
  SPI SUBSYSTEM
 -M:    Grant Likely <grant.likely@secretlab.ca>
  M:    Mark Brown <broonie@kernel.org>
 +M:    Grant Likely <grant.likely@linaro.org>
  L:    spi-devel-general@lists.sourceforge.net
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
  Q:    http://patchwork.kernel.org/project/spi-devel-general/list/
 -T:    git git://git.secretlab.ca/git/linux-2.6.git
  S:    Maintained
  F:    Documentation/spi/
  F:    drivers/spi/
@@@ -7686,11 -7566,6 +7686,11 @@@ M:    David Täht <d@teklibre.com
  S:    Odd Fixes
  F:    drivers/staging/frontier/
  
 +STAGING - GO7007 MPEG CODEC
 +M:    Hans Verkuil <hans.verkuil@cisco.com>
 +S:    Maintained
 +F:    drivers/staging/media/go7007/
 +
  STAGING - INDUSTRIAL IO
  M:    Jonathan Cameron <jic23@cam.ac.uk>
  L:    linux-iio@vger.kernel.org
@@@ -7741,8 -7616,8 +7741,8 @@@ S:      Odd Fixe
  F:    drivers/staging/sm7xxfb/
  
  STAGING - SOFTLOGIC 6x10 MPEG CODEC
 -M:    Ben Collins <bcollins@bluecherry.net>
 -S:    Odd Fixes
 +M:    Ismael Luceno <ismael.luceno@corp.bluecherry.net>
 +S:    Supported
  F:    drivers/staging/media/solo6x10/
  
  STAGING - SPEAKUP CONSOLE SPEECH DRIVER
@@@ -8007,7 -7882,7 +8007,7 @@@ L:      linux-tegra@vger.kernel.or
  Q:    http://patchwork.ozlabs.org/project/linux-tegra/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git
  S:    Supported
 -K:    (?i)[^a-z]tegra
 +N:    [^a-z]tegra
  
  TEHUTI ETHERNET DRIVER
  M:    Andy Gospodarek <andy@greyhouse.net>
@@@ -8029,14 -7904,11 +8029,14 @@@ F:   arch/xtensa
  
  THERMAL
  M:      Zhang Rui <rui.zhang@intel.com>
 +M:      Eduardo Valentin <eduardo.valentin@ti.com>
  L:      linux-pm@vger.kernel.org
  T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git
 +Q:      https://patchwork.kernel.org/project/linux-pm/list/
  S:      Supported
  F:      drivers/thermal/
  F:      include/linux/thermal.h
 +F:      include/linux/cpu_cooling.h
  
  THINGM BLINK(1) USB RGB LED DRIVER
  M:    Vivien Didelot <vivien.didelot@savoirfairelinux.com>
@@@ -8053,12 -7925,6 +8053,12 @@@ T:    git git://repo.or.cz/linux-2.6/linux
  S:    Maintained
  F:    drivers/platform/x86/thinkpad_acpi.c
  
 +TI BANDGAP AND THERMAL DRIVER
 +M:    Eduardo Valentin <eduardo.valentin@ti.com>
 +L:    linux-pm@vger.kernel.org
 +S:    Maintained
 +F:    drivers/staging/omap-thermal/
 +
  TI FLASH MEDIA INTERFACE DRIVER
  M:    Alex Dubov <oakad@yahoo.com>
  S:    Maintained
@@@ -8496,10 -8362,9 +8496,10 @@@ S:    Maintaine
  F:    drivers/usb/serial/option.c
  
  USB PEGASUS DRIVER
 -M:    Petko Manolov <petkan@users.sourceforge.net>
 +M:    Petko Manolov <petkan@nucleusys.com>
  L:    linux-usb@vger.kernel.org
  L:    netdev@vger.kernel.org
 +T:    git git://git.code.sf.net/p/pegasus2/git
  W:    http://pegasus2.sourceforge.net/
  S:    Maintained
  F:    drivers/net/usb/pegasus.*
@@@ -8519,10 -8384,9 +8519,10 @@@ S:    Supporte
  F:    drivers/usb/class/usblp.c
  
  USB RTL8150 DRIVER
 -M:    Petko Manolov <petkan@users.sourceforge.net>
 +M:    Petko Manolov <petkan@nucleusys.com>
  L:    linux-usb@vger.kernel.org
  L:    netdev@vger.kernel.org
 +T:    git git://git.code.sf.net/p/pegasus2/git
  W:    http://pegasus2.sourceforge.net/
  S:    Maintained
  F:    drivers/net/usb/rtl8150.c
@@@ -8656,7 -8520,7 +8656,7 @@@ F:      drivers/usb/gadget/*uvc*.
  F:    drivers/usb/gadget/webcam.c
  
  USB WIRELESS RNDIS DRIVER (rndis_wlan)
 -M:    Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
 +M:    Jussi Kivilinna <jussi.kivilinna@iki.fi>
  L:    linux-wireless@vger.kernel.org
  S:    Maintained
  F:    drivers/net/wireless/rndis_wlan.c
@@@ -8761,7 -8625,6 +8761,7 @@@ F:      drivers/virtio
  F:    drivers/net/virtio_net.c
  F:    drivers/block/virtio_blk.c
  F:    include/linux/virtio_*.h
 +F:    include/uapi/linux/virtio_*.h
  
  VIRTIO HOST (VHOST)
  M:    "Michael S. Tsirkin" <mst@redhat.com>
@@@ -8849,7 -8712,7 +8849,7 @@@ F:      drivers/scsi/vmw_pvscsi.
  F:    drivers/scsi/vmw_pvscsi.h
  
  VOLTAGE AND CURRENT REGULATOR FRAMEWORK
 -M:    Liam Girdwood <lrg@ti.com>
 +M:    Liam Girdwood <lgirdwood@gmail.com>
  M:    Mark Brown <broonie@kernel.org>
  W:    http://opensource.wolfsonmicro.com/node/15
  W:    http://www.slimlogic.co.uk/?p=48
@@@ -9113,7 -8976,9 +9113,7 @@@ S:      Maintaine
  F:    drivers/net/ethernet/xilinx/xilinx_axienet*
  
  XILINX SYSTEMACE DRIVER
 -M:    Grant Likely <grant.likely@secretlab.ca>
 -W:    http://www.secretlab.ca/
 -S:    Maintained
 +S:    Unmaintained
  F:    drivers/block/xsysace.c
  
  XILINX UARTLITE SERIAL DRIVER

diff --combined drivers/scsi/fcoe/fcoe_ctlr.c
index cd743c545ce9a9031970a222f2087d6a15d4d589,4c7764181b7936c8ba41c561a5eb41d721c119d4..795843dde8ecdf422718ab3cb2e54ceb18c43dff
--- 1/drivers/scsi/fcoe/fcoe_ctlr.c
--- 2/drivers/scsi/fcoe/fcoe_ctlr.c
+++ b/drivers/scsi/fcoe/fcoe_ctlr.c
@@@ -1548,9 -1548,6 +1548,6 @@@ static struct fcoe_fcf *fcoe_ctlr_selec
  {
        struct fcoe_fcf *fcf;
        struct fcoe_fcf *best = fip->sel_fcf;
-       struct fcoe_fcf *first;
- 
-       first = list_first_entry(&fip->fcfs, struct fcoe_fcf, list);
  
        list_for_each_entry(fcf, &fip->fcfs, list) {
                LIBFCOE_FIP_DBG(fip, "consider FCF fab %16.16llx "
@@@ -1568,17 -1565,15 +1565,15 @@@
                                        "" : "un");
                        continue;
                }
-               if (fcf->fabric_name != first->fabric_name ||
-                   fcf->vfid != first->vfid ||
-                   fcf->fc_map != first->fc_map) {
+               if (!best || fcf->pri < best->pri || best->flogi_sent)
+                       best = fcf;
+               if (fcf->fabric_name != best->fabric_name ||
+                   fcf->vfid != best->vfid ||
+                   fcf->fc_map != best->fc_map) {
                        LIBFCOE_FIP_DBG(fip, "Conflicting fabric, VFID, "
                                        "or FC-MAP\n");
                        return NULL;
                }
-               if (fcf->flogi_sent)
-                       continue;
-               if (!best || fcf->pri < best->pri || best->flogi_sent)
-                       best = fcf;
        }
        fip->sel_fcf = best;
        if (best) {
@@@ -2161,7 -2156,7 +2156,7 @@@ static void fcoe_ctlr_vn_restart(struc
  
        if (fip->probe_tries < FIP_VN_RLIM_COUNT) {
                fip->probe_tries++;
 -              wait = random32() % FIP_VN_PROBE_WAIT;
 +              wait = prandom_u32() % FIP_VN_PROBE_WAIT;
        } else
                wait = FIP_VN_RLIM_INT;
        mod_timer(&fip->timer, jiffies + msecs_to_jiffies(wait));
@@@ -2794,7 -2789,7 +2789,7 @@@ static void fcoe_ctlr_vn_timeout(struc
                                          fcoe_all_vn2vn, 0);
                        fip->port_ka_time = jiffies +
                                 msecs_to_jiffies(FIP_VN_BEACON_INT +
 -                                      (random32() % FIP_VN_BEACON_FUZZ));
 +                                      (prandom_u32() % FIP_VN_BEACON_FUZZ));
                }
                if (time_before(fip->port_ka_time, next_time))
                        next_time = fip->port_ka_time;