Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

Pull ceph updates from Sage Weil:
 "This is a big batch.  From Ilya we have:

   - rbd support for more than ~250 mapped devices (now uses same scheme
     that SCSI does for device major/minor numbering)
   - crush updates for new mapping behaviors (will be needed for coming
     erasure coding support, among other things)
   - preliminary support for tiered storage pools

  There is also a big series fixing a pile cephfs bugs with clustered
  MDSs from Yan Zheng, ACL support for cephfs from Guangliang Zhao, ceph
  fscache improvements from Li Wang, improved behavior when we get
  ENOSPC from Josh Durgin, some readv/writev improvements from
  Majianpeng, and the usual mix of small cleanups"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (76 commits)
  ceph: cast PAGE_SIZE to size_t in ceph_sync_write()
  ceph: fix dout() compile warnings in ceph_filemap_fault()
  libceph: support CEPH_FEATURE_OSD_CACHEPOOL feature
  libceph: follow redirect replies from osds
  libceph: rename ceph_osd_request::r_{oloc,oid} to r_base_{oloc,oid}
  libceph: follow {read,write}_tier fields on osd request submission
  libceph: add ceph_pg_pool_by_id()
  libceph: CEPH_OSD_FLAG_* enum update
  libceph: replace ceph_calc_ceph_pg() with ceph_oloc_oid_to_pg()
  libceph: introduce and start using oid abstraction
  libceph: rename MAX_OBJ_NAME_SIZE to CEPH_MAX_OID_NAME_LEN
  libceph: move ceph_file_layout helpers to ceph_fs.h
  libceph: start using oloc abstraction
  libceph: dout() is missing a newline
  libceph: add ceph_kv{malloc,free}() and switch to them
  libceph: support CEPH_FEATURE_EXPORT_PEER
  ceph: add imported caps when handling cap export message
  ceph: add open export target session helper
  ceph: remove exported caps when handling cap import message
  ceph: handle session flush message
  ...

diff --combined MAINTAINERS
index 2507f38b208f7a6773d31a8f0921c9cc8c4210a8,8ade3c9d82cc84dd074bce0f12fb1791985c4a79..9bf651c578062ecbc0cd9a6d95959955882da987
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -93,11 -93,6 +93,11 @@@ Descriptions of section entries
        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.
 +         scripts/get_maintainer.pl has different behavior for files that
 +         match F: pattern and matches of N: patterns.  By default,
 +         get_maintainer will not look at git log history when an F: pattern
 +         match occurs.  When an N: match occurs, git log history is used
 +         to also notify the people that have git commit signatures.
        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:
@@@ -257,7 -252,6 +257,7 @@@ F: Documentation/ABI/testing/sysfs-bus-
  F:    drivers/pci/*acpi*
  F:    drivers/pci/*/*acpi*
  F:    drivers/pci/*/*/*acpi*
 +F:    tools/power/acpi
  
  ACPI COMPONENT ARCHITECTURE (ACPICA)
  M:    Robert Moore <[email protected]>
@@@ -272,7 -266,6 +272,7 @@@ T: git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    drivers/acpi/acpica/
  F:    include/acpi/
 +F:    tools/power/acpi/
  
  ACPI FAN DRIVER
  M:    Zhang Rui <[email protected]>
@@@ -491,6 -484,7 +491,6 @@@ M: Hannes Reinecke <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/scsi/aic7xxx/
 -F:    drivers/scsi/aic7xxx_old/
  
  AIMSLAB FM RADIO RECEIVER DRIVER
  M:    Hans Verkuil <[email protected]>
@@@ -545,13 -539,6 +545,13 @@@ F:       drivers/tty/serial/altera_jtaguart.
  F:    include/linux/altera_uart.h
  F:    include/linux/altera_jtaguart.h
  
 +AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER
 +M:    Tom Lendacky <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/crypto/ccp/
 +F:    include/linux/ccp.h
 +
  AMD FAM15H PROCESSOR POWER MONITORING DRIVER
  M:    Andreas Herrmann <[email protected]>
  L:    [email protected]
@@@ -779,12 -766,7 +779,12 @@@ ARM/Allwinner A1X SoC suppor
  M:    Maxime Ripard <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -F:    arch/arm/mach-sunxi/
 +N:    sun[x4567]i
 +
 +ARM/Allwinner SoC Clock Support
 +M:    Emilio López <[email protected]>
 +S:    Maintained
 +F:    drivers/clk/sunxi/
  
  ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES
  M:    Andrew Victor <[email protected]>
@@@ -801,7 -783,7 +801,7 @@@ F: arch/arm/boot/dts/sama*.dt
  F:    arch/arm/boot/dts/sama*.dtsi
  
  ARM/CALXEDA HIGHBANK ARCHITECTURE
 -M:    Rob Herring <rob[email protected]>
 +M:    Rob Herring <rob[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-highbank/
@@@ -885,12 -867,6 +885,12 @@@ S:       Maintaine
  F:    arch/arm/mach-ebsa110/
  F:    drivers/net/ethernet/amd/am79c961a.*
  
 +ARM/ENERGY MICRO (SILICON LABS) EFM32 SUPPORT
 +M:    Uwe Kleine-König <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +N:    efm32
 +
  ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
  M:    Daniel Ribeiro <[email protected]>
  M:    Stefan Schmidt <[email protected]>
@@@ -917,15 -893,20 +917,15 @@@ F:      arch/arm/include/asm/hardware/dec212
  F:    arch/arm/mach-footbridge/
  
  ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
 +M:    Shawn Guo <[email protected]>
  M:    Sascha Hauer <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -T:    git git://git.pengutronix.de/git/imx/linux-2.6.git
 +T:    git git://git.linaro.org/people/shawnguo/linux-2.6.git
  F:    arch/arm/mach-imx/
 +F:    arch/arm/boot/dts/imx*
  F:    arch/arm/configs/imx*_defconfig
  
 -ARM/FREESCALE IMX6
 -M:    Shawn Guo <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -T:    git git://git.linaro.org/people/shawnguo/linux-2.6.git
 -F:    arch/arm/mach-imx/*imx6*
 -
  ARM/FREESCALE MXS ARM ARCHITECTURE
  M:    Shawn Guo <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1032,8 -1013,6 +1032,8 @@@ M:      Santosh Shilimkar <santosh.shilimkar
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-keystone/
 +F:    drivers/clk/keystone/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
  
  ARM/LOGICPD PXA270 MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
@@@ -1053,12 -1032,6 +1053,12 @@@ L:    [email protected]
  S:    Maintained
  F:    arch/arm/mach-mvebu/
  
 +ARM/Marvell Berlin SoC support
 +M:    Sebastian Hesselbarth <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-berlin/
 +
  ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support
  M:    Jason Cooper <[email protected]>
  M:    Andrew Lunn <[email protected]>
@@@ -1352,14 -1325,6 +1352,14 @@@ F:    drivers/rtc/rtc-ab8500.
  F:    drivers/rtc/rtc-pl031.c
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
  
 +ARM/Ux500 CLOCK FRAMEWORK SUPPORT
 +M:    Ulf Hansson <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +T:    git git://git.linaro.org/people/ulfh/clk.git
 +S:    Maintained
 +F:    drivers/clk/ux500/
 +F:    include/linux/platform_data/clk-ux500.h
 +
  ARM/VFP SUPPORT
  M:    Russell King <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1406,10 -1371,6 +1406,10 @@@ T:    git git://git.xilinx.com/linux-xlnx.
  S:    Supported
  F:    arch/arm/mach-zynq/
  F:    drivers/cpuidle/cpuidle-zynq.c
 +N:    zynq
 +N:    xilinx
 +F:    drivers/clocksource/cadence_ttc_timer.c
 +F:    drivers/mmc/host/sdhci-of-arasan.c
  
  ARM SMMU DRIVER
  M:    Will Deacon <[email protected]>
@@@ -1474,7 -1435,7 +1474,7 @@@ F:      Documentation/aoe
  F:    drivers/block/aoe/
  
  ATHEROS ATH GENERIC UTILITIES
 -M:    "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>
 +M:    "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/wireless/ath/*
@@@ -1482,7 -1443,7 +1482,7 @@@
  ATHEROS ATH5K WIRELESS DRIVER
  M:    Jiri Slaby <[email protected]>
  M:    Nick Kossifidis <[email protected]>
 -M:    "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>
 +M:    "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
  L:    [email protected]
  L:    [email protected]
  W:    http://wireless.kernel.org/en/users/Drivers/ath5k
@@@ -1497,6 -1458,17 +1497,6 @@@ T:     git git://github.com/kvalo/ath.gi
  S:    Supported
  F:    drivers/net/wireless/ath/ath6kl/
  
 -ATHEROS ATH9K WIRELESS DRIVER
 -M:    "Luis R. Rodriguez" <[email protected]>
 -M:    Jouni Malinen <[email protected]>
 -M:    Vasanthakumar Thiagarajan <[email protected]>
 -M:    Senthil Balasubramanian <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -W:    http://wireless.kernel.org/en/users/Drivers/ath9k
 -S:    Supported
 -F:    drivers/net/wireless/ath/ath9k/
 -
  WILOCITY WIL6210 WIRELESS DRIVER
  M:    Vladimir Kondratiev <[email protected]>
  L:    [email protected]
@@@ -1626,10 -1598,11 +1626,10 @@@ S:      Supporte
  F:      drivers/scsi/esas2r
  
  AUDIT SUBSYSTEM
 -M:    Al Viro <[email protected]>
  M:    Eric Paris <[email protected]>
  L:    [email protected] (subscribers-only)
  W:    http://people.redhat.com/sgrubb/audit/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git
 +T:    git git://git.infradead.org/users/eparis/audit.git
  S:    Maintained
  F:    include/linux/audit.h
  F:    include/uapi/linux/audit.h
@@@ -2051,7 -2024,6 +2051,7 @@@ L:      [email protected]
  W:    http://gitorious.org/linux-can
  T:    git git://gitorious.org/linux-can/linux-can-next.git
  S:    Maintained
 +F:    Documentation/networking/can.txt
  F:    net/can/
  F:    include/linux/can/core.h
  F:    include/uapi/linux/can.h
@@@ -2166,8 -2138,7 +2166,8 @@@ S:      Maintaine
  F:    Documentation/zh_CN/
  
  CHIPIDEA USB HIGH SPEED DUAL ROLE CONTROLLER
 -M:    Alexander Shishkin <[email protected]>
 +M:    Peter Chen <[email protected]>
 +T:    git://github.com/hzpeterchen/linux-usb.git
  L:    [email protected]
  S:    Maintained
  F:    drivers/usb/chipidea/
@@@ -2186,11 -2157,6 +2186,11 @@@ M:    Nishank Trivedi <[email protected]
  S:    Supported
  F:    drivers/net/ethernet/cisco/enic/
  
 +CISCO VIC LOW LATENCY NIC DRIVER
 +M:      Upinder Malhi <[email protected]>
 +S:      Supported
 +F:      drivers/infiniband/hw/usnic
 +
  CIRRUS LOGIC EP93XX ETHERNET DRIVER
  M:    Hartley Sweeten <[email protected]>
  L:    [email protected]
@@@ -2652,7 -2618,7 +2652,7 @@@ S:      Maintaine
  F:    drivers/platform/x86/dell-laptop.c
  
  DELL LAPTOP SMM DRIVER
 -S:    Orphan
 +M:    Guenter Roeck <[email protected]>
  F:    drivers/char/i8k.c
  F:    include/uapi/linux/i8k.h
  
@@@ -2671,7 -2637,7 +2671,7 @@@ DESIGNWARE USB2 DRD IP DRIVE
  M:    Paul Zimmerman <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/staging/dwc2/
 +F:    drivers/usb/dwc2/
  
  DESIGNWARE USB3 DRD IP DRIVER
  M:    Felipe Balbi <[email protected]>
@@@ -2861,10 -2827,8 +2861,10 @@@ F:    include/uapi/drm
  
  INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
  M:    Daniel Vetter <[email protected]>
 +M:    Jani Nikula <[email protected]>
  L:    [email protected]
  L:    [email protected]
 +Q:    http://patchwork.freedesktop.org/project/intel-gfx/
  T:    git git://people.freedesktop.org/~danvet/drm-intel
  S:    Supported
  F:    drivers/gpu/drm/i915/
@@@ -3368,7 -3332,6 +3368,7 @@@ EXTERNAL CONNECTOR SUBSYSTEM (EXTCON
  M:    MyungJoo Ham <[email protected]>
  M:    Chanwoo Choi <[email protected]>
  L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git
  S:    Maintained
  F:    drivers/extcon/
  F:    Documentation/extcon/
@@@ -3378,6 -3341,7 +3378,6 @@@ M:      Jingoo Han <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/video/exynos/exynos_dp*
 -F:    include/video/exynos_dp*
  
  EXYNOS MIPI DISPLAY DRIVERS
  M:    Inki Dae <[email protected]>
@@@ -3667,7 -3631,6 +3667,7 @@@ W:      http://en.wikipedia.org/wiki/F2F
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
  S:    Maintained
  F:    Documentation/filesystems/f2fs.txt
 +F:    Documentation/ABI/testing/sysfs-fs-f2fs
  F:    fs/f2fs/
  F:    include/linux/f2fs_fs.h
  
@@@ -3802,11 -3765,9 +3802,11 @@@ F:    include/uapi/linux/gigaset_dev.
  
  GPIO SUBSYSTEM
  M:    Linus Walleij <[email protected]>
 -S:    Maintained
 +M:    Alexandre Courbot <[email protected]>
  L:    [email protected]
 -F:    Documentation/gpio.txt
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
 +S:    Maintained
 +F:    Documentation/gpio/
  F:    drivers/gpio/
  F:    include/linux/gpio*
  F:    include/asm-generic/gpio.h
@@@ -3874,12 -3835,6 +3874,12 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/usb/gspca/
  
 +GUID PARTITION TABLE (GPT)
 +M:    Davidlohr Bueso <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    block/partitions/efi.*
 +
  STK1160 USB VIDEO CAPTURE DRIVER
  M:    Ezequiel Garcia <[email protected]>
  L:    [email protected]
@@@ -3988,12 -3943,6 +3988,12 @@@ S:    Orpha
  F:    Documentation/filesystems/hfs.txt
  F:    fs/hfs/
  
 +HFSPLUS FILESYSTEM
 +L:    [email protected]
 +S:    Orphan
 +F:    Documentation/filesystems/hfsplus.txt
 +F:    fs/hfsplus/
 +
  HGA FRAMEBUFFER DRIVER
  M:    Ferenc Bakonyi <[email protected]>
  L:    [email protected]
@@@ -4095,14 -4044,6 +4095,14 @@@ W:    http://artax.karlin.mff.cuni.cz/~mik
  S:    Maintained
  F:    fs/hpfs/
  
 +HSI SUBSYSTEM
 +M:    Sebastian Reichel <[email protected]>
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-bus-hsi
 +F:    drivers/hsi/
 +F:    include/linux/hsi/
 +F:    include/uapi/linux/hsi/
 +
  HSO 3G MODEM DRIVER
  M:    Jan Dumon <[email protected]>
  W:    http://www.pharscape.org
@@@ -4514,16 -4455,17 +4514,16 @@@ M:   Deepak Saxena <[email protected]
  S:    Maintained
  F:    drivers/char/hw_random/ixp4xx-rng.c
  
 -INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe/ixgbevf/i40e)
 +INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe/ixgbevf/i40e/i40evf)
  M:    Jeff Kirsher <[email protected]>
  M:    Jesse Brandeburg <[email protected]>
  M:    Bruce Allan <[email protected]>
  M:    Carolyn Wyborny <[email protected]>
  M:    Don Skidmore <[email protected]>
  M:    Greg Rose <[email protected]>
 -M:    Peter P Waskiewicz Jr <[email protected]>
  M:    Alex Duyck <[email protected]>
  M:    John Ronciak <[email protected]>
 -M:    Tushar Dave <tushar.n.dave@intel.com>
 +M:    Mitch Williams <mitch.a.williams@intel.com>
  L:    [email protected]
  W:    http://www.intel.com/support/feedback.htm
  W:    http://e1000.sourceforge.net/
@@@ -4539,7 -4481,6 +4539,7 @@@ F:      Documentation/networking/ixgb.tx
  F:    Documentation/networking/ixgbe.txt
  F:    Documentation/networking/ixgbevf.txt
  F:    Documentation/networking/i40e.txt
 +F:    Documentation/networking/i40evf.txt
  F:    drivers/net/ethernet/intel/
  
  INTEL-MID GPIO DRIVER
@@@ -4957,7 -4898,7 +4957,7 @@@ F:      include/linux/sunrpc
  F:    include/uapi/linux/sunrpc/
  
  KERNEL VIRTUAL MACHINE (KVM)
 -M:    Gleb Natapov <gleb@redhat.com>
 +M:    Gleb Natapov <gleb@kernel.org>
  M:    Paolo Bonzini <[email protected]>
  L:    [email protected]
  W:    http://www.linux-kvm.org
@@@ -5183,11 -5124,6 +5183,11 @@@ F:    drivers/lguest
  F:    include/linux/lguest*.h
  F:    tools/lguest/
  
 +LIBLOCKDEP
 +M:    Sasha Levin <[email protected]>
 +S:    Maintained
 +F:    tools/lib/lockdep/
 +
  LINUX FOR IBM pSERIES (RS/6000)
  M:    Paul Mackerras <[email protected]>
  W:    http://www.ibm.com/linux/ltc/projects/ppc
@@@ -5783,7 -5719,7 +5783,7 @@@ F:      drivers/mfd
  F:    include/linux/mfd/
  
  MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
 -M:    Chris Ball <c[email protected]>
 +M:    Chris Ball <c[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git
  S:    Maintained
@@@ -5973,21 -5909,12 +5973,21 @@@ M:   Steffen Klassert <steffen.klassert@s
  M:    Herbert Xu <[email protected]>
  M:    "David S. Miller" <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git
  S:    Maintained
  F:    net/xfrm/
  F:    net/key/
  F:    net/ipv4/xfrm*
 +F:    net/ipv4/esp4.c
 +F:    net/ipv4/ah4.c
 +F:    net/ipv4/ipcomp.c
 +F:    net/ipv4/ip_vti.c
  F:    net/ipv6/xfrm*
 +F:    net/ipv6/esp6.c
 +F:    net/ipv6/ah6.c
 +F:    net/ipv6/ipcomp6.c
 +F:    net/ipv6/ip6_vti.c
  F:    include/uapi/linux/xfrm.h
  F:    include/net/xfrm.h
  
@@@ -6308,7 -6235,7 +6308,7 @@@ F:      drivers/i2c/busses/i2c-ocores.
  
  OPEN FIRMWARE AND FLATTENED DEVICE TREE
  M:    Grant Likely <[email protected]>
 -M:    Rob Herring <rob[email protected]>
 +M:    Rob Herring <rob[email protected]>
  L:    [email protected]
  W:    http://fdt.secretlab.ca
  T:    git git://git.secretlab.ca/git/linux-2.6.git
@@@ -6320,7 -6247,7 +6320,7 @@@ K:      of_get_propert
  K:    of_match_table
  
  OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
 -M:    Rob Herring <rob[email protected]>
 +M:    Rob Herring <rob[email protected]>
  M:    Pawel Moll <[email protected]>
  M:    Mark Rutland <[email protected]>
  M:    Ian Campbell <[email protected]>
@@@ -6534,52 -6461,19 +6534,52 @@@ F:   drivers/pci
  F:    include/linux/pci*
  F:    arch/x86/pci/
  
 +PCI DRIVER FOR IMX6
 +M:    Richard Zhu <[email protected]>
 +M:    Shawn Guo <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/pci/host/*imx6*
 +
 +PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)
 +M:    Thomas Petazzoni <[email protected]>
 +M:    Jason Cooper <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/pci/host/*mvebu*
 +
  PCI DRIVER FOR NVIDIA TEGRA
  M:    Thierry Reding <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt
  F:    drivers/pci/host/pci-tegra.c
  
 +PCI DRIVER FOR RENESAS R-CAR
 +M:    Simon Horman <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/pci/host/*rcar*
 +
  PCI DRIVER FOR SAMSUNG EXYNOS
  M:    Jingoo Han <[email protected]>
  L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/pci/host/pci-exynos.c
  
 +PCI DRIVER FOR SYNOPSIS DESIGNWARE
 +M:    Mohit Kumar <[email protected]>
 +M:    Jingoo Han <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/pci/host/*designware*
 +
  PCMCIA SUBSYSTEM
  P:    Linux PCMCIA Team
  L:    [email protected]
@@@ -6753,7 -6647,7 +6753,7 @@@ F:      include/linux/timer
  F:    kernel/*timer*
  
  POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
 -M:    Anton Vorontsov <[email protected]>
 +M:    Dmitry Eremin-Solenikov <[email protected]>
  M:    David Woodhouse <[email protected]>
  T:    git git://git.infradead.org/battery-2.6.git
  S:    Maintained
@@@ -6972,7 -6866,8 +6972,7 @@@ S:      Maintaine
  F:    drivers/scsi/qla1280.[ch]
  
  QLOGIC QLA2XXX FC-SCSI DRIVER
 -M:    Andrew Vasquez <[email protected]>
 -M:    [email protected]
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    Documentation/scsi/LICENSE.qla2xxx
@@@ -7034,14 -6929,6 +7034,14 @@@ T:    git git://linuxtv.org/anttip/media_t
  S:    Maintained
  F:    drivers/media/tuners/qt1010*
  
 +QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
 +M:    QCA ath9k Development <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +W:    http://wireless.kernel.org/en/users/Drivers/ath9k
 +S:    Supported
 +F:    drivers/net/wireless/ath/ath9k/
 +
  QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
  M:    Kalle Valo <[email protected]>
  L:    [email protected]
@@@ -7075,7 -6962,7 +7075,7 @@@ F:      drivers/media/parport/*-qcam
  RADOS BLOCK DEVICE (RBD)
  M:    Yehuda Sadeh <[email protected]>
  M:    Sage Weil <[email protected]>
- M:    Alex Elder <elder@inktank.com>
+ M:    Alex Elder <elder@kernel.org>
  M:    [email protected]
  W:    http://ceph.com/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git
@@@ -7153,12 -7040,6 +7153,12 @@@ T:    git git://git.kernel.org/pub/scm/lin
  F:    Documentation/RCU/torture.txt
  F:    kernel/rcu/torture.c
  
 +RCUTORTURE TEST FRAMEWORK
 +M:    "Paul E. McKenney" <[email protected]>
 +S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 +F:    tools/testing/selftests/rcutorture
 +
  RDC R-321X SoC
  M:    Florian Fainelli <[email protected]>
  S:    Maintained
@@@ -7457,12 -7338,6 +7457,12 @@@ L:    [email protected]
  S:    Supported
  F:    drivers/media/i2c/s5c73m3/*
  
 +SAMSUNG SOC CLOCK DRIVERS
 +M:    Tomasz Figa <[email protected]>
 +S:    Supported
 +L:    [email protected] (moderated for non-subscribers)
 +F:    drivers/clk/samsung/
 +
  SERIAL DRIVERS
  M:    Greg Kroah-Hartman <[email protected]>
  L:    [email protected]
@@@ -7534,7 -7409,7 +7534,7 @@@ S:      Maintaine
  F:    drivers/scsi/sr*
  
  SCSI RDMA PROTOCOL (SRP) INITIATOR
 -M:    David Dillow <[email protected]>
 +M:    Bart Van Assche <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    http://www.openfabrics.org
@@@ -7546,9 -7421,8 +7546,9 @@@ F:      include/scsi/srp.
  SCSI SG DRIVER
  M:    Doug Gilbert <[email protected]>
  L:    [email protected]
 -W:    http://www.torque.net/sg
 +W:    http://sg.danny.cz/sg
  S:    Maintained
 +F:    Documentation/scsi/scsi-generic.txt
  F:    drivers/scsi/sg.c
  F:    include/scsi/sg.h
  
@@@ -7610,7 -7484,7 +7610,7 @@@ S:      Maintaine
  F:    drivers/mmc/host/sdricoh_cs.c
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
 -M:    Chris Ball <c[email protected]>
 +M:    Chris Ball <c[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git
  S:    Maintained
@@@ -7703,7 -7577,7 +7703,7 @@@ F:      drivers/net/ethernet/emulex/benet
  
  SFC NETWORK DRIVER
  M:    Solarflare linux maintainers <[email protected]>
 -M:    Ben Hutchings <bhutchings@solarflare.com>
 +M:    Shradha Shah <sshah@solarflare.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/sfc/
@@@ -8628,7 -8502,6 +8628,7 @@@ S:      Supporte
  F:      drivers/thermal/
  F:      include/linux/thermal.h
  F:      include/linux/cpu_cooling.h
 +F:      Documentation/devicetree/bindings/thermal/
  
  THINGM BLINK(1) USB RGB LED DRIVER
  M:    Vivien Didelot <[email protected]>
@@@ -8696,11 -8569,12 +8696,11 @@@ S:   Maintaine
  F:    sound/soc/codecs/twl4030*
  
  TI WILINK WIRELESS DRIVERS
 -M:    Luciano Coelho <[email protected]>
  L:    [email protected]
  W:    http://wireless.kernel.org/en/users/Drivers/wl12xx
  W:    http://wireless.kernel.org/en/users/Drivers/wl1251
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git
 -S:    Maintained
 +S:    Orphan
  F:    drivers/net/wireless/ti/
  F:    include/linux/wl12xx.h
  
@@@ -8769,6 -8643,7 +8769,6 @@@ F:      include/linux/toshiba.
  F:    include/uapi/linux/toshiba.h
  
  TMIO MMC DRIVER
 -M:    Guennadi Liakhovetski <[email protected]>
  M:    Ian Molton <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -8800,10 -8675,14 +8800,10 @@@ S:   Odd fixe
  F:    drivers/media/usb/tm6000/
  
  TPM DEVICE DRIVER
 -M:    Leonidas Da Silva Barbosa <[email protected]>
 -M:    Ashley Lai <[email protected]>
  M:    Peter Huewe <[email protected]>
 -M:    Rajiv Andrade <[email protected]>
 -W:    http://tpmdd.sourceforge.net
 +M:    Ashley Lai <[email protected]>
  M:    Marcel Selhorst <[email protected]>
 -M:    Sirrix AG <[email protected]>
 -W:    http://www.sirrix.com
 +W:    http://tpmdd.sourceforge.net
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/char/tpm/
@@@ -9293,7 -9172,6 +9293,7 @@@ F:      include/media/videobuf2-
  
  VIRTIO CONSOLE DRIVER
  M:    Amit Shah <[email protected]>
 +L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/char/virtio_console.c
@@@ -9303,7 -9181,6 +9303,7 @@@ F:      include/uapi/linux/virtio_console.
  VIRTIO CORE, NET AND BLOCK DRIVERS
  M:    Rusty Russell <[email protected]>
  M:    "Michael S. Tsirkin" <[email protected]>
 +L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/virtio/
@@@ -9316,7 -9193,6 +9316,7 @@@ F:      include/uapi/linux/virtio_*.
  VIRTIO HOST (VHOST)
  M:    "Michael S. Tsirkin" <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -9614,7 -9490,6 +9614,7 @@@ M:      Konrad Rzeszutek Wilk <konrad.wilk@o
  M:    Boris Ostrovsky <[email protected]>
  M:    David Vrabel <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git
  S:    Supported
  F:    arch/x86/xen/
  F:    drivers/*/xen-*front.c
@@@ -9661,7 -9536,7 +9661,7 @@@ F:      drivers/xen/*swiotlb
  
  XFS FILESYSTEM
  P:    Silicon Graphics Inc
 -M:    Dave Chinner <dchinner@fromorbit.com>
 +M:    Dave Chinner <david@fromorbit.com>
  M:    Ben Myers <[email protected]>
  M:    [email protected]
  L:    [email protected]