Merge branch 'next' (accumulated 3.16 merge window patches) into master

Now that 3.15 is released, this merges the 'next' branch into 'master',
bringing us to the normal situation where my 'master' branch is the
merge window.

* accumulated work in next: (6809 commits)
  ufs: sb mutex merge + mutex_destroy
  powerpc: update comments for generic idle conversion
  cris: update comments for generic idle conversion
  idle: remove cpu_idle() forward declarations
  nbd: zero from and len fields in NBD_CMD_DISCONNECT.
  mm: convert some level-less printks to pr_*
  MAINTAINERS: adi-buildroot-devel is moderated
  MAINTAINERS: add linux-api for review of API/ABI changes
  mm/kmemleak-test.c: use pr_fmt for logging
  fs/dlm/debug_fs.c: replace seq_printf by seq_puts
  fs/dlm/lockspace.c: convert simple_str to kstr
  fs/dlm/config.c: convert simple_str to kstr
  mm: mark remap_file_pages() syscall as deprecated
  mm: memcontrol: remove unnecessary memcg argument from soft limit functions
  mm: memcontrol: clean up memcg zoneinfo lookup
  mm/memblock.c: call kmemleak directly from memblock_(alloc|free)
  mm/mempool.c: update the kmemleak stack trace for mempool allocations
  lib/radix-tree.c: update the kmemleak stack trace for radix tree allocations
  mm: introduce kmemleak_update_trace()
  mm/kmemleak.c: use %u to print ->checksum
  ...

1 files changed, 73 insertions, 24 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 6c484ac93da7..1b22565c59ac 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -210,6 +210,13 @@ S:	Supported
 F:      Documentation/scsi/aacraid.txt
 F:      drivers/scsi/aacraid/
 
+ABI/API
+L:      linux-api@vger.kernel.org
+F:      Documentation/ABI/
+F:      include/linux/syscalls.h
+F:      include/uapi/
+F:      kernel/sys_ni.c
+
 ABIT UGURU 1,2 HARDWARE MONITOR DRIVER
 M:      Hans de Goede <hdegoede@redhat.com>
 L:      lm-sensors@lm-sensors.org
@@ -355,7 +362,7 @@ F:	Documentation/hwmon/adm1025
 F:      drivers/hwmon/adm1025.c
 
 ADM1029 HARDWARE MONITOR DRIVER
-M:      Corentin Labbe <corentin.labbe@geomatys.fr>
+M:      Corentin Labbe <clabbe.montjoie@gmail.com>
 L:      lm-sensors@lm-sensors.org
 S:      Maintained
 F:      drivers/hwmon/adm1029.c
@@ -647,7 +654,7 @@ F:	sound/soc/codecs/ssm*
 F:      sound/soc/codecs/sigmadsp.*
 
 ANALOG DEVICES INC ASOC DRIVERS
-L:      adi-buildroot-devel@lists.sourceforge.net
+L:      adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
 W:      http://blackfin.uclinux.org/
 S:      Supported
@@ -808,6 +815,11 @@ F:	arch/arm/boot/dts/at91*.dtsi
 F:      arch/arm/boot/dts/sama*.dts
 F:      arch/arm/boot/dts/sama*.dtsi
 
+ARM/ATMEL AT91 Clock Support
+M:      Boris Brezillon <boris.brezillon@free-electrons.com>
+S:      Maintained
+F:      drivers/clk/at91
+
 ARM/CALXEDA HIGHBANK ARCHITECTURE
 M:      Rob Herring <robh@kernel.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1617,12 +1629,6 @@ S:	Supported
 F:      drivers/misc/atmel_tclib.c
 F:      drivers/clocksource/tcb_clksrc.c
 
-ATMEL TSADCC DRIVER
-M:      Josh Wu <josh.wu@atmel.com>
-L:      linux-input@vger.kernel.org
-S:      Supported
-F:      drivers/input/touchscreen/atmel_tsadcc.c
-
 ATMEL USBA UDC DRIVER
 M:      Nicolas Ferre <nicolas.ferre@atmel.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1764,54 +1770,54 @@ F:	include/uapi/linux/bfs_fs.h
 
 BLACKFIN ARCHITECTURE
 M:      Steven Miao <realmz6@gmail.com>
-L:      adi-buildroot-devel@lists.sourceforge.net
+L:      adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 T:      git git://git.code.sf.net/p/adi-linux/code
 W:      http://blackfin.uclinux.org
 S:      Supported
 F:      arch/blackfin/
 
 BLACKFIN EMAC DRIVER
-L:      adi-buildroot-devel@lists.sourceforge.net
+L:      adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:      http://blackfin.uclinux.org
 S:      Supported
 F:      drivers/net/ethernet/adi/
 
 BLACKFIN RTC DRIVER
-L:      adi-buildroot-devel@lists.sourceforge.net
+L:      adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:      http://blackfin.uclinux.org
 S:      Supported
 F:      drivers/rtc/rtc-bfin.c
 
 BLACKFIN SDH DRIVER
 M:      Sonic Zhang <sonic.zhang@analog.com>
-L:      adi-buildroot-devel@lists.sourceforge.net
+L:      adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 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:      adi-buildroot-devel@lists.sourceforge.net
+L:      adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:      http://blackfin.uclinux.org
 S:      Supported
 F:      drivers/tty/serial/bfin_uart.c
 
 BLACKFIN WATCHDOG DRIVER
-L:      adi-buildroot-devel@lists.sourceforge.net
+L:      adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:      http://blackfin.uclinux.org
 S:      Supported
 F:      drivers/watchdog/bfin_wdt.c
 
 BLACKFIN I2C TWI DRIVER
 M:      Sonic Zhang <sonic.zhang@analog.com>
-L:      adi-buildroot-devel@lists.sourceforge.net
+L:      adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:      http://blackfin.uclinux.org/
 S:      Supported
 F:      drivers/i2c/busses/i2c-bfin-twi.c
 
 BLACKFIN MEDIA DRIVER
 M:      Scott Jiang <scott.jiang.linux@gmail.com>
-L:      adi-buildroot-devel@lists.sourceforge.net
+L:      adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:      http://blackfin.uclinux.org/
 S:      Supported
 F:      drivers/media/platform/blackfin/
@@ -2194,6 +2200,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
 S:      Supported
 F:      drivers/char/*
 F:      drivers/misc/*
+F:      include/linux/miscdevice.h
 
 CHECKPATCH
 M:      Andy Whitcroft <apw@canonical.com>
@@ -2410,7 +2417,6 @@ F:	drivers/net/ethernet/ti/cpmac.c
 CPU FREQUENCY DRIVERS
 M:      Rafael J. Wysocki <rjw@rjwysocki.net>
 M:      Viresh Kumar <viresh.kumar@linaro.org>
-L:      cpufreq@vger.kernel.org
 L:      linux-pm@vger.kernel.org
 S:      Maintained
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
@@ -2421,7 +2427,6 @@ F:	include/linux/cpufreq.h
 CPU FREQUENCY DRIVERS - ARM BIG LITTLE
 M:      Viresh Kumar <viresh.kumar@linaro.org>
 M:      Sudeep Holla <sudeep.holla@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
@@ -2784,12 +2789,14 @@ F:	sound/soc/codecs/da[79]*.[ch]
 
 DIGI NEO AND CLASSIC PCI PRODUCTS
 M:      Lidza Louina <lidza.louina@gmail.com>
+M:      Mark Hounschell <markh@compro.net>
 L:      driverdev-devel@linuxdriverproject.org
 S:      Maintained
 F:      drivers/staging/dgnc/
 
 DIGI EPCA PCI PRODUCTS
 M:      Lidza Louina <lidza.louina@gmail.com>
+M:      Mark Hounschell <markh@compro.net>
 L:      driverdev-devel@linuxdriverproject.org
 S:      Maintained
 F:      drivers/staging/dgap/
@@ -3886,6 +3893,11 @@ L:	kvm@vger.kernel.org
 S:      Supported
 F:      drivers/uio/uio_pci_generic.c
 
+GET_MAINTAINER SCRIPT
+M:      Joe Perches <joe@perches.com>
+S:      Maintained
+F:      scripts/get_maintainer.pl
+
 GFS2 FILE SYSTEM
 M:      Steven Whitehouse <swhiteho@redhat.com>
 L:      cluster-devel@redhat.com
@@ -4010,9 +4022,8 @@ S:	Odd Fixes
 F:      drivers/media/usb/hdpvr/
 
 HWPOISON MEMORY FAILURE HANDLING
-M:      Andi Kleen <andi@firstfloor.org>
+M:      Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
 L:      linux-mm@kvack.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git hwpoison
 S:      Maintained
 F:      mm/memory-failure.c
 F:      mm/hwpoison-inject.c
@@ -4203,9 +4214,11 @@ S:	Maintained
 F:      fs/hpfs/
 
 HSI SUBSYSTEM
-M:      Sebastian Reichel <sre@debian.org>
+M:      Sebastian Reichel <sre@kernel.org>
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git
 S:      Maintained
 F:      Documentation/ABI/testing/sysfs-bus-hsi
+F:      Documentation/hsi.txt
 F:      drivers/hsi/
 F:      include/linux/hsi/
 F:      include/uapi/linux/hsi/
@@ -6417,6 +6430,7 @@ F:	drivers/usb/*/*omap*
 F:      arch/arm/*omap*/usb*
 
 OMAP GPIO DRIVER
+M:      Javier Martinez Canillas <javier@dowhile0.org>
 M:      Santosh Shilimkar <santosh.shilimkar@ti.com>
 M:      Kevin Hilman <khilman@deeprootsystems.com>
 L:      linux-omap@vger.kernel.org
@@ -6706,6 +6720,7 @@ F:	Documentation/PCI/
 F:      drivers/pci/
 F:      include/linux/pci*
 F:      arch/x86/pci/
+F:      arch/x86/kernel/quirks.c
 
 PCI DRIVER FOR IMX6
 M:      Richard Zhu <r65037@freescale.com>
@@ -6753,6 +6768,14 @@ L:	linux-pci@vger.kernel.org
 S:      Maintained
 F:      drivers/pci/host/*designware*
 
+PCI DRIVER FOR GENERIC OF HOSTS
+M:      Will Deacon <will.deacon@arm.com>
+L:      linux-pci@vger.kernel.org
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      Maintained
+F:      Documentation/devicetree/bindings/pci/host-generic-pci.txt
+F:      drivers/pci/host/pci-host-generic.c
+
 PCMCIA SUBSYSTEM
 P:      Linux PCMCIA Team
 L:      linux-pcmcia@lists.infradead.org
@@ -6937,7 +6960,6 @@ F:	drivers/power/
 
 PNP SUPPORT
 M:      Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-M:      Bjorn Helgaas <bhelgaas@google.com>
 S:      Maintained
 F:      drivers/pnp/
 
@@ -7661,7 +7683,6 @@ L:	linux-media@vger.kernel.org
 Q:      https://patchwork.linuxtv.org/project/linux-media/list/
 S:      Supported
 F:      drivers/media/platform/exynos4-is/
-F:      include/media/s5p_fimc.h
 
 SAMSUNG S3C24XX/S3C64XX SOC SERIES CAMIF DRIVER
 M:      Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
@@ -7964,6 +7985,26 @@ M:	Robin Holt <robinmholt@gmail.com>
 S:      Maintained
 F:      drivers/misc/sgi-xp/
 
+SI2157 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/si2157*
+
+SI2168 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/si2168*
+
 SI470X FM RADIO RECEIVER I2C DRIVER
 M:      Hans Verkuil <hverkuil@xs4all.nl>
 L:      linux-media@vger.kernel.org
@@ -8263,6 +8304,7 @@ L:	alsa-devel@alsa-project.org (moderated for non-subscribers)
 W:      http://www.alsa-project.org/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
 T:      git git://git.alsa-project.org/alsa-kernel.git
+Q:      http://patchwork.kernel.org/project/alsa-devel/list/
 S:      Maintained
 F:      Documentation/sound/
 F:      include/sound/
@@ -8483,7 +8525,7 @@ S:	Maintained
 F:      drivers/staging/olpc_dcon/
 
 STAGING - OZMO DEVICES USB OVER WIFI DRIVER
-M:      Rupesh Gujare <rupesh.gujare@atmel.com>
+M:      Shigekatsu Tateno <shigekatsu.tateno@atmel.com>
 S:      Maintained
 F:      drivers/staging/ozwpan/
 
@@ -8498,6 +8540,13 @@ M:	Florian Schilhabel <florian.c.schilhabel@googlemail.com>.
 S:      Odd Fixes
 F:      drivers/staging/rtl8712/
 
+STAGING - REALTEK RTL8723U WIRELESS DRIVER
+M:      Larry Finger <Larry.Finger@lwfinger.net>
+M:      Jes Sorensen <Jes.Sorensen@redhat.com>
+L:      linux-wireless@vger.kernel.org
+S:      Maintained
+F:      drivers/staging/rtl8723au/
+
 STAGING - SILICON MOTION SM7XX FRAME BUFFER DRIVER
 M:      Teddy Wang <teddy.wang@siliconmotion.com.cn>
 S:      Odd Fixes