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

Pull core debug changes from Ingo Molnar:
 "This contains mostly kernel debugging related updates:

   - make hung_task detection more configurable to distros
   - add final bits for x86 UV NMI debugging, with related KGDB changes
   - update the mailing-list of MAINTAINERS entries I'm involved with"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  hung_task: Display every hung task warning
  sysctl: Add neg_one as a standard constraint
  x86/uv/nmi, kgdb/kdb: Fix UV NMI handler when KDB not configured
  x86/uv/nmi: Fix Sparse warnings
  kgdb/kdb: Fix no KDB config problem
  MAINTAINERS: Restore "L: linux-kernel@vger.kernel.org" entries

diff --combined Documentation/sysctl/kernel.txt
index ee9a2f983b9901d74266f9bfa9c1a2da68c49450,4205f3c05cbe1eee55d823773741bd381e3ba6e0..e55124e7c40cd0eef8afb92c34913cd68c42faac
--- 1/Documentation/sysctl/kernel.txt
--- 2/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@@ -33,7 -33,10 +33,11 @@@ show up in /proc/sys/kernel
  - domainname
  - hostname
  - hotplug
+ - hung_task_panic
+ - hung_task_check_count
+ - hung_task_timeout_secs
+ - hung_task_warnings
 +- kexec_load_disabled
  - kptr_restrict
  - kstack_depth_to_print       [ X86 only ]
  - l2cr                        [ PPC only ]
@@@ -288,18 -291,44 +292,56 @@@ Default value is "/sbin/hotplug"
  
  ==============================================================
  
+ hung_task_panic:
+ 
+ Controls the kernel's behavior when a hung task is detected.
+ This file shows up if CONFIG_DETECT_HUNG_TASK is enabled.
+ 
+ 0: continue operation. This is the default behavior.
+ 
+ 1: panic immediately.
+ 
+ ==============================================================
+ 
+ hung_task_check_count:
+ 
+ The upper bound on the number of tasks that are checked.
+ This file shows up if CONFIG_DETECT_HUNG_TASK is enabled.
+ 
+ ==============================================================
+ 
+ hung_task_timeout_secs:
+ 
+ Check interval. When a task in D state did not get scheduled
+ for more than this value report a warning.
+ This file shows up if CONFIG_DETECT_HUNG_TASK is enabled.
+ 
+ 0: means infinite timeout - no checking done.
+ 
+ ==============================================================
+ 
+ hung_task_warning:
+ 
+ The maximum number of warnings to report. During a check interval
+ When this value is reached, no more the warnings will be reported.
+ This file shows up if CONFIG_DETECT_HUNG_TASK is enabled.
+ 
+ -1: report an infinite number of warnings.
+ 
+ ==============================================================
+ 
 +kexec_load_disabled:
 +
 +A toggle indicating if the kexec_load syscall has been disabled. This
 +value defaults to 0 (false: kexec_load enabled), but can be set to 1
 +(true: kexec_load disabled). Once true, kexec can no longer be used, and
 +the toggle cannot be set back to false. This allows a kexec image to be
 +loaded before disabling the syscall, allowing a system to set up (and
 +later use) an image without it being altered. Generally used together
 +with the "modules_disabled" sysctl.
 +
 +==============================================================
 +
  kptr_restrict:
  
  This toggle indicates whether restrictions are placed on
@@@ -344,7 -373,7 +386,7 @@@ A toggle value indicating if modules ar
  in an otherwise modular kernel.  This toggle defaults to off
  (0), but can be set true (1).  Once true, modules can be
  neither loaded nor unloaded, and the toggle cannot be set back
 -to false.
 +to false.  Generally used with the "kexec_load_disabled" toggle.
  
  ==============================================================
  

diff --combined MAINTAINERS
index 5f840aeab64d3169a6cf37345c0d419b92daa569,e048de5ca11b6fb3746b7fa3b62155a3c1a0b549..6fb8759f49de3f0be391a777e7fc26a52d496ca5
--- 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 <robert.moore@intel.com>
@@@ -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 <rui.zhang@intel.com>
@@@ -309,36 -302,36 +309,36 @@@ F:      sound/pci/ad1889.
  
  AD525X ANALOG DEVICES DIGITAL POTENTIOMETERS DRIVER
  M:    Michael Hennerich <michael.hennerich@analog.com>
 -L:    device-drivers-devel@blackfin.uclinux.org
  W:    http://wiki.analog.com/AD5254
 +W:    http://ez.analog.com/community/linux-device-drivers
  S:    Supported
  F:    drivers/misc/ad525x_dpot.c
  
  AD5398 CURRENT REGULATOR DRIVER (AD5398/AD5821)
  M:    Michael Hennerich <michael.hennerich@analog.com>
 -L:    device-drivers-devel@blackfin.uclinux.org
  W:    http://wiki.analog.com/AD5398
 +W:    http://ez.analog.com/community/linux-device-drivers
  S:    Supported
  F:    drivers/regulator/ad5398.c
  
  AD714X CAPACITANCE TOUCH SENSOR DRIVER (AD7142/3/7/8/7A)
  M:    Michael Hennerich <michael.hennerich@analog.com>
 -L:    device-drivers-devel@blackfin.uclinux.org
  W:    http://wiki.analog.com/AD7142
 +W:    http://ez.analog.com/community/linux-device-drivers
  S:    Supported
  F:    drivers/input/misc/ad714x.c
  
  AD7877 TOUCHSCREEN DRIVER
  M:    Michael Hennerich <michael.hennerich@analog.com>
 -L:    device-drivers-devel@blackfin.uclinux.org
  W:    http://wiki.analog.com/AD7877
 +W:    http://ez.analog.com/community/linux-device-drivers
  S:    Supported
  F:    drivers/input/touchscreen/ad7877.c
  
  AD7879 TOUCHSCREEN DRIVER (AD7879/AD7889)
  M:    Michael Hennerich <michael.hennerich@analog.com>
 -L:    device-drivers-devel@blackfin.uclinux.org
  W:    http://wiki.analog.com/AD7879
 +W:    http://ez.analog.com/community/linux-device-drivers
  S:    Supported
  F:    drivers/input/touchscreen/ad7879.c
  
@@@ -347,7 -340,7 +347,7 @@@ M: Jiri Kosina <jkosina@suse.cz
  S:    Maintained
  
  ADM1025 HARDWARE MONITOR DRIVER
 -M:    Jean Delvare <khali@linux-fr.org>
 +M:    Jean Delvare <jdelvare@suse.de>
  L:    lm-sensors@lm-sensors.org
  S:    Maintained
  F:    Documentation/hwmon/adm1025
@@@ -374,8 -367,8 +374,8 @@@ F: include/media/adp1653.
  
  ADP5520 BACKLIGHT DRIVER WITH IO EXPANDER (ADP5520/ADP5501)
  M:    Michael Hennerich <michael.hennerich@analog.com>
 -L:    device-drivers-devel@blackfin.uclinux.org
  W:    http://wiki.analog.com/ADP5520
 +W:    http://ez.analog.com/community/linux-device-drivers
  S:    Supported
  F:    drivers/mfd/adp5520.c
  F:    drivers/video/backlight/adp5520_bl.c
@@@ -385,16 -378,16 +385,16 @@@ F:      drivers/input/keyboard/adp5520-keys.
  
  ADP5588 QWERTY KEYPAD AND IO EXPANDER DRIVER (ADP5588/ADP5587)
  M:    Michael Hennerich <michael.hennerich@analog.com>
 -L:    device-drivers-devel@blackfin.uclinux.org
  W:    http://wiki.analog.com/ADP5588
 +W:    http://ez.analog.com/community/linux-device-drivers
  S:    Supported
  F:    drivers/input/keyboard/adp5588-keys.c
  F:    drivers/gpio/gpio-adp5588.c
  
  ADP8860 BACKLIGHT DRIVER (ADP8860/ADP8861/ADP8863)
  M:    Michael Hennerich <michael.hennerich@analog.com>
 -L:    device-drivers-devel@blackfin.uclinux.org
  W:    http://wiki.analog.com/ADP8860
 +W:    http://ez.analog.com/community/linux-device-drivers
  S:    Supported
  F:    drivers/video/backlight/adp8860_bl.c
  
@@@ -412,7 -405,7 +412,7 @@@ S: Maintaine
  F:    drivers/macintosh/therm_adt746x.c
  
  ADT7475 HARDWARE MONITOR DRIVER
 -M:    Jean Delvare <khali@linux-fr.org>
 +M:    Jean Delvare <jdelvare@suse.de>
  L:    lm-sensors@lm-sensors.org
  S:    Maintained
  F:    Documentation/hwmon/adt7475
@@@ -420,8 -413,8 +420,8 @@@ F: drivers/hwmon/adt7475.
  
  ADXL34X THREE-AXIS DIGITAL ACCELEROMETER DRIVER (ADXL345/ADXL346)
  M:    Michael Hennerich <michael.hennerich@analog.com>
 -L:    device-drivers-devel@blackfin.uclinux.org
  W:    http://wiki.analog.com/ADXL345
 +W:    http://ez.analog.com/community/linux-device-drivers
  S:    Supported
  F:    drivers/input/misc/adxl34x.c
  
@@@ -491,6 -484,7 +491,6 @@@ M: Hannes Reinecke <hare@suse.de
  L:    linux-scsi@vger.kernel.org
  S:    Maintained
  F:    drivers/scsi/aic7xxx/
 -F:    drivers/scsi/aic7xxx_old/
  
  AIMSLAB FM RADIO RECEIVER DRIVER
  M:    Hans Verkuil <hverkuil@xs4all.nl>
@@@ -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 <thomas.lendacky@amd.com>
 +L:    linux-crypto@vger.kernel.org
 +S:    Supported
 +F:    drivers/crypto/ccp/
 +F:    include/linux/ccp.h
 +
  AMD FAM15H PROCESSOR POWER MONITORING DRIVER
  M:    Andreas Herrmann <herrmann.der.user@googlemail.com>
  L:    lm-sensors@lm-sensors.org
@@@ -627,9 -614,9 +627,9 @@@ F: drivers/media/i2c/adv7842
  
  ANALOG DEVICES INC ASOC CODEC DRIVERS
  M:    Lars-Peter Clausen <lars@metafoo.de>
 -L:    device-drivers-devel@blackfin.uclinux.org
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  W:    http://wiki.analog.com/
 +W:    http://ez.analog.com/community/linux-device-drivers
  S:    Supported
  F:    sound/soc/codecs/adau*
  F:    sound/soc/codecs/adav*
@@@ -639,7 -626,7 +639,7 @@@ F: sound/soc/codecs/ssm
  F:    sound/soc/codecs/sigmadsp.*
  
  ANALOG DEVICES INC ASOC DRIVERS
 -L:    uclinux-dist-devel@blackfin.uclinux.org
 +L:    adi-buildroot-devel@lists.sourceforge.net
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  W:    http://blackfin.uclinux.org/
  S:    Supported
@@@ -779,12 -766,7 +779,12 @@@ ARM/Allwinner A1X SoC suppor
  M:    Maxime Ripard <maxime.ripard@free-electrons.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 -F:    arch/arm/mach-sunxi/
 +N:    sun[x4567]i
 +
 +ARM/Allwinner SoC Clock Support
 +M:    Emilio López <emilio@elopez.com.ar>
 +S:    Maintained
 +F:    drivers/clk/sunxi/
  
  ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES
  M:    Andrew Victor <linux@maxim.org.za>
@@@ -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 <kernel@pengutronix.de>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +N:    efm32
 +
  ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
  M:    Daniel Ribeiro <drwyrm@gmail.com>
  M:    Stefan Schmidt <stefan@openezx.org>
@@@ -1053,12 -1029,6 +1053,12 @@@ L:    linux-arm-kernel@lists.infradead.or
  S:    Maintained
  F:    arch/arm/mach-mvebu/
  
 +ARM/Marvell Berlin SoC support
 +M:    Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-berlin/
 +
  ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support
  M:    Jason Cooper <jason@lakedaemon.net>
  M:    Andrew Lunn <andrew@lunn.ch>
@@@ -1352,14 -1322,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 <ulf.hansson@linaro.org>
 +L:    linux-arm-kernel@lists.infradead.org (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 <linux@arm.linux.org.uk>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1409,7 -1371,6 +1409,7 @@@ F:      drivers/cpuidle/cpuidle-zynq.
  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 <will.deacon@arm.com>
@@@ -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:    linux-wireless@vger.kernel.org
  S:    Supported
  F:    drivers/net/wireless/ath/*
@@@ -1482,7 -1443,7 +1482,7 @@@
  ATHEROS ATH5K WIRELESS DRIVER
  M:    Jiri Slaby <jirislaby@gmail.com>
  M:    Nick Kossifidis <mickflemm@gmail.com>
 -M:    "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>
 +M:    "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
  L:    linux-wireless@vger.kernel.org
  L:    ath5k-devel@lists.ath5k.org
  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" <mcgrof@qca.qualcomm.com>
 -M:    Jouni Malinen <jouni@qca.qualcomm.com>
 -M:    Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
 -M:    Senthil Balasubramanian <senthilb@qca.qualcomm.com>
 -L:    linux-wireless@vger.kernel.org
 -L:    ath9k-devel@lists.ath9k.org
 -W:    http://wireless.kernel.org/en/users/Drivers/ath9k
 -S:    Supported
 -F:    drivers/net/wireless/ath/ath9k/
 -
  WILOCITY WIL6210 WIRELESS DRIVER
  M:    Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
  L:    linux-wireless@vger.kernel.org
@@@ -1626,10 -1598,11 +1626,10 @@@ S:      Supporte
  F:      drivers/scsi/esas2r
  
  AUDIT SUBSYSTEM
 -M:    Al Viro <viro@zeniv.linux.org.uk>
  M:    Eric Paris <eparis@redhat.com>
  L:    linux-audit@redhat.com (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
@@@ -1742,54 -1715,56 +1742,54 @@@ F:   fs/bfs
  F:    include/uapi/linux/bfs_fs.h
  
  BLACKFIN ARCHITECTURE
 -M:    Mike Frysinger <vapier@gentoo.org>
 -L:    uclinux-dist-devel@blackfin.uclinux.org
 +M:    Steven Miao <realmz6@gmail.com>
 +L:    adi-buildroot-devel@lists.sourceforge.net
  W:    http://blackfin.uclinux.org
  S:    Supported
  F:    arch/blackfin/
  
  BLACKFIN EMAC DRIVER
 -L:    uclinux-dist-devel@blackfin.uclinux.org
 +L:    adi-buildroot-devel@lists.sourceforge.net
  W:    http://blackfin.uclinux.org
  S:    Supported
  F:    drivers/net/ethernet/adi/
  
  BLACKFIN RTC DRIVER
 -M:    Mike Frysinger <vapier.adi@gmail.com>
 -L:    uclinux-dist-devel@blackfin.uclinux.org
 +L:    adi-buildroot-devel@lists.sourceforge.net
  W:    http://blackfin.uclinux.org
  S:    Supported
  F:    drivers/rtc/rtc-bfin.c
  
  BLACKFIN SDH DRIVER
  M:    Sonic Zhang <sonic.zhang@analog.com>
 -L:    uclinux-dist-devel@blackfin.uclinux.org
 +L:    adi-buildroot-devel@lists.sourceforge.net
  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
 +L:    adi-buildroot-devel@lists.sourceforge.net
  W:    http://blackfin.uclinux.org
  S:    Supported
  F:    drivers/tty/serial/bfin_uart.c
  
  BLACKFIN WATCHDOG DRIVER
 -M:    Mike Frysinger <vapier.adi@gmail.com>
 -L:    uclinux-dist-devel@blackfin.uclinux.org
 +L:    adi-buildroot-devel@lists.sourceforge.net
  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:    uclinux-dist-devel@blackfin.uclinux.org
 +L:    adi-buildroot-devel@lists.sourceforge.net
  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:    uclinux-dist-devel@blackfin.uclinux.org
 +L:    adi-buildroot-devel@lists.sourceforge.net
  W:    http://blackfin.uclinux.org/
  S:    Supported
  F:    drivers/media/platform/blackfin/
@@@ -2049,7 -2024,6 +2049,7 @@@ L:      linux-can@vger.kernel.or
  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
@@@ -2184,11 -2158,6 +2184,11 @@@ M:    Nishank Trivedi <nistrive@cisco.com
  S:    Supported
  F:    drivers/net/ethernet/cisco/enic/
  
 +CISCO VIC LOW LATENCY NIC DRIVER
 +M:      Upinder Malhi <umalhi@cisco.com>
 +S:      Supported
 +F:      drivers/infiniband/hw/usnic
 +
  CIRRUS LOGIC EP93XX ETHERNET DRIVER
  M:    Hartley Sweeten <hsweeten@visionengravers.com>
  L:    netdev@vger.kernel.org
@@@ -2222,6 -2191,7 +2222,7 @@@ F:      include/linux/clk.
  CLOCKSOURCE, CLOCKEVENT DRIVERS
  M:    Daniel Lezcano <daniel.lezcano@linaro.org>
  M:    Thomas Gleixner <tglx@linutronix.de>
+ L:    linux-kernel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
  S:    Supported
  F:    drivers/clocksource
@@@ -2650,7 -2620,7 +2651,7 @@@ S:      Maintaine
  F:    drivers/platform/x86/dell-laptop.c
  
  DELL LAPTOP SMM DRIVER
 -S:    Orphan
 +M:    Guenter Roeck <linux@roeck-us.net>
  F:    drivers/char/i8k.c
  F:    include/uapi/linux/i8k.h
  
@@@ -2669,7 -2639,7 +2670,7 @@@ DESIGNWARE USB2 DRD IP DRIVE
  M:    Paul Zimmerman <paulz@synopsys.com>
  L:    linux-usb@vger.kernel.org
  S:    Maintained
 -F:    drivers/staging/dwc2/
 +F:    drivers/usb/dwc2/
  
  DESIGNWARE USB3 DRD IP DRIVER
  M:    Felipe Balbi <balbi@ti.com>
@@@ -3366,7 -3336,6 +3367,7 @@@ EXTERNAL CONNECTOR SUBSYSTEM (EXTCON
  M:    MyungJoo Ham <myungjoo.ham@samsung.com>
  M:    Chanwoo Choi <cw00.choi@samsung.com>
  L:    linux-kernel@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git
  S:    Maintained
  F:    drivers/extcon/
  F:    Documentation/extcon/
@@@ -3376,6 -3345,7 +3377,6 @@@ M:      Jingoo Han <jg1.han@samsung.com
  L:    linux-fbdev@vger.kernel.org
  S:    Maintained
  F:    drivers/video/exynos/exynos_dp*
 -F:    include/video/exynos_dp*
  
  EXYNOS MIPI DISPLAY DRIVERS
  M:    Inki Dae <inki.dae@samsung.com>
@@@ -3387,7 -3357,7 +3388,7 @@@ F:      drivers/video/exynos/exynos_mipi
  F:    include/video/exynos_mipi*
  
  F71805F HARDWARE MONITORING DRIVER
 -M:    Jean Delvare <khali@linux-fr.org>
 +M:    Jean Delvare <jdelvare@suse.de>
  L:    lm-sensors@lm-sensors.org
  S:    Maintained
  F:    Documentation/hwmon/f71805f
@@@ -3665,7 -3635,6 +3666,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
  
@@@ -3914,7 -3883,7 +3915,7 @@@ S:      Odd Fixe
  F:    drivers/tty/hvc/
  
  HARDWARE MONITORING
 -M:    Jean Delvare <khali@linux-fr.org>
 +M:    Jean Delvare <jdelvare@suse.de>
  M:    Guenter Roeck <linux@roeck-us.net>
  L:    lm-sensors@lm-sensors.org
  W:    http://www.lm-sensors.org/
@@@ -3986,12 -3955,6 +3987,12 @@@ S:    Orpha
  F:    Documentation/filesystems/hfs.txt
  F:    fs/hfs/
  
 +HFSPLUS FILESYSTEM
 +L:    linux-fsdevel@vger.kernel.org
 +S:    Orphan
 +F:    Documentation/filesystems/hfsplus.txt
 +F:    fs/hfsplus/
 +
  HGA FRAMEBUFFER DRIVER
  M:    Ferenc Bakonyi <fero@drama.obuda.kando.hu>
  L:    linux-nvidia@lists.surfsouth.com
@@@ -4023,6 -3986,7 +4024,7 @@@ F:      include/uapi/linux/hid
  
  HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS
  M:    Thomas Gleixner <tglx@linutronix.de>
+ L:    linux-kernel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
  S:    Maintained
  F:    Documentation/timers/
@@@ -4142,7 -4106,7 +4144,7 @@@ F:      include/linux/hyperv.
  F:    tools/hv/
  
  I2C OVER PARALLEL PORT
 -M:    Jean Delvare <khali@linux-fr.org>
 +M:    Jean Delvare <jdelvare@suse.de>
  L:    linux-i2c@vger.kernel.org
  S:    Maintained
  F:    Documentation/i2c/busses/i2c-parport
@@@ -4151,7 -4115,7 +4153,7 @@@ F:      drivers/i2c/busses/i2c-parport.
  F:    drivers/i2c/busses/i2c-parport-light.c
  
  I2C/SMBUS CONTROLLER DRIVERS FOR PC
 -M:    Jean Delvare <khali@linux-fr.org>
 +M:    Jean Delvare <jdelvare@suse.de>
  L:    linux-i2c@vger.kernel.org
  S:    Maintained
  F:    Documentation/i2c/busses/i2c-ali1535
@@@ -4192,7 -4156,7 +4194,7 @@@ F:      drivers/i2c/busses/i2c-ismt.
  F:    Documentation/i2c/busses/i2c-ismt
  
  I2C/SMBUS STUB DRIVER
 -M:    Jean Delvare <khali@linux-fr.org>
 +M:    Jean Delvare <jdelvare@suse.de>
  L:    linux-i2c@vger.kernel.org
  S:    Maintained
  F:    drivers/i2c/i2c-stub.c
@@@ -4211,7 -4175,7 +4213,7 @@@ F:      include/uapi/linux/i2c.
  F:    include/uapi/linux/i2c-*.h
  
  I2C-TAOS-EVM DRIVER
 -M:    Jean Delvare <khali@linux-fr.org>
 +M:    Jean Delvare <jdelvare@suse.de>
  L:    linux-i2c@vger.kernel.org
  S:    Maintained
  F:    Documentation/i2c/busses/i2c-taos-evm
@@@ -4512,7 -4476,7 +4514,7 @@@ M:      Deepak Saxena <dsaxena@plexity.net
  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 <jeffrey.t.kirsher@intel.com>
  M:    Jesse Brandeburg <jesse.brandeburg@intel.com>
  M:    Bruce Allan <bruce.w.allan@intel.com>
@@@ -4521,7 -4485,6 +4523,7 @@@ M:      Don Skidmore <donald.c.skidmore@inte
  M:    Greg Rose <gregory.v.rose@intel.com>
  M:    Alex Duyck <alexander.h.duyck@intel.com>
  M:    John Ronciak <john.ronciak@intel.com>
 +M:    Mitch Williams <mitch.a.williams@intel.com>
  L:    e1000-devel@lists.sourceforge.net
  W:    http://www.intel.com/support/feedback.htm
  W:    http://e1000.sourceforge.net/
@@@ -4537,7 -4500,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
@@@ -4694,6 -4656,7 +4696,7 @@@ F:      net/irda
  
  IRQ SUBSYSTEM
  M:    Thomas Gleixner <tglx@linutronix.de>
+ L:    linux-kernel@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
  F:    kernel/irq/
@@@ -4768,7 -4731,7 +4771,7 @@@ S:      Maintaine
  F:    drivers/isdn/hardware/eicon/
  
  IT87 HARDWARE MONITORING DRIVER
 -M:    Jean Delvare <khali@linux-fr.org>
 +M:    Jean Delvare <jdelvare@suse.de>
  L:    lm-sensors@lm-sensors.org
  S:    Maintained
  F:    Documentation/hwmon/it87
@@@ -4955,7 -4918,7 +4958,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 <pbonzini@redhat.com>
  L:    kvm@vger.kernel.org
  W:    http://www.linux-kvm.org
@@@ -5138,7 -5101,7 +5141,7 @@@ F:      drivers/leds
  F:    include/linux/leds.h
  
  LEGACY EEPROM DRIVER
 -M:    Jean Delvare <khali@linux-fr.org>
 +M:    Jean Delvare <jdelvare@suse.de>
  S:    Maintained
  F:    Documentation/misc-devices/eeprom
  F:    drivers/misc/eeprom/eeprom.c
@@@ -5286,21 -5249,21 +5289,21 @@@ S:   Maintaine
  F:    drivers/hwmon/lm73.c
  
  LM78 HARDWARE MONITOR DRIVER
 -M:    Jean Delvare <khali@linux-fr.org>
 +M:    Jean Delvare <jdelvare@suse.de>
  L:    lm-sensors@lm-sensors.org
  S:    Maintained
  F:    Documentation/hwmon/lm78
  F:    drivers/hwmon/lm78.c
  
  LM83 HARDWARE MONITOR DRIVER
 -M:    Jean Delvare <khali@linux-fr.org>
 +M:    Jean Delvare <jdelvare@suse.de>
  L:    lm-sensors@lm-sensors.org
  S:    Maintained
  F:    Documentation/hwmon/lm83
  F:    drivers/hwmon/lm83.c
  
  LM90 HARDWARE MONITOR DRIVER
 -M:    Jean Delvare <khali@linux-fr.org>
 +M:    Jean Delvare <jdelvare@suse.de>
  L:    lm-sensors@lm-sensors.org
  S:    Maintained
  F:    Documentation/hwmon/lm90
@@@ -5325,6 -5288,7 +5328,7 @@@ F:      drivers/media/usb/dvb-usb-v2/lmedm04
  LOCKDEP AND LOCKSTAT
  M:    Peter Zijlstra <peterz@infradead.org>
  M:    Ingo Molnar <mingo@redhat.com>
+ L:    linux-kernel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core/locking
  S:    Maintained
  F:    Documentation/lockdep*.txt
@@@ -5620,11 -5584,10 +5624,11 @@@ F:   mm/page_cgroup.
  
  MEMORY TECHNOLOGY DEVICES (MTD)
  M:    David Woodhouse <dwmw2@infradead.org>
 +M:    Brian Norris <computersforpeace@gmail.com>
  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
 +T:    git git://git.infradead.org/linux-mtd.git
  S:    Maintained
  F:    drivers/mtd/
  F:    include/linux/mtd/
@@@ -5782,7 -5745,7 +5786,7 @@@ F:      drivers/mfd
  F:    include/linux/mfd/
  
  MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
 -M:    Chris Ball <cjb@laptop.org>
 +M:    Chris Ball <chris@printf.net>
  L:    linux-mmc@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git
  S:    Maintained
@@@ -6493,7 -6456,7 +6497,7 @@@ S:      Maintaine
  F:    drivers/char/pc8736x_gpio.c
  
  PC87427 HARDWARE MONITORING DRIVER
 -M:    Jean Delvare <khali@linux-fr.org>
 +M:    Jean Delvare <jdelvare@suse.de>
  L:    lm-sensors@lm-sensors.org
  S:    Maintained
  F:    Documentation/hwmon/pc87427
@@@ -6622,6 -6585,7 +6626,7 @@@ M:      Peter Zijlstra <a.p.zijlstra@chello.
  M:    Paul Mackerras <paulus@samba.org>
  M:    Ingo Molnar <mingo@redhat.com>
  M:    Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
+ L:    linux-kernel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
  S:    Supported
  F:    kernel/events/*
@@@ -6745,6 -6709,7 +6750,7 @@@ F:      drivers/scsi/pm8001
  
  POSIX CLOCKS and TIMERS
  M:    Thomas Gleixner <tglx@linutronix.de>
+ L:    linux-kernel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
  S:    Supported
  F:    fs/timerfd.c
@@@ -6752,7 -6717,7 +6758,7 @@@ F:      include/linux/timer
  F:    kernel/*timer*
  
  POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
 -M:    Anton Vorontsov <anton@enomsg.org>
 +M:    Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  M:    David Woodhouse <dwmw2@infradead.org>
  T:    git git://git.infradead.org/battery-2.6.git
  S:    Maintained
@@@ -6941,12 -6906,6 +6947,12 @@@ F:    include/sound/pxa2xx-lib.
  F:    sound/arm/pxa*
  F:    sound/soc/pxa/
  
 +PXA3xx NAND FLASH DRIVER
 +M:    Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
 +L:    linux-mtd@lists.infradead.org
 +S:    Maintained
 +F:    drivers/mtd/nand/pxa3xx-nand.c
 +
  MMP SUPPORT
  M:    Eric Miao <eric.y.miao@gmail.com>
  M:    Haojian Zhuang <haojian.zhuang@gmail.com>
@@@ -6977,7 -6936,8 +6983,7 @@@ S:      Maintaine
  F:    drivers/scsi/qla1280.[ch]
  
  QLOGIC QLA2XXX FC-SCSI DRIVER
 -M:    Andrew Vasquez <andrew.vasquez@qlogic.com>
 -M:    linux-driver@qlogic.com
 +M:    qla2xxx-upstream@qlogic.com
  L:    linux-scsi@vger.kernel.org
  S:    Supported
  F:    Documentation/scsi/LICENSE.qla2xxx
@@@ -7039,14 -6999,6 +7045,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 <ath9k-devel@qca.qualcomm.com>
 +L:    linux-wireless@vger.kernel.org
 +L:    ath9k-devel@lists.ath9k.org
 +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 <kvalo@qca.qualcomm.com>
  L:    ath10k@lists.infradead.org
@@@ -7080,7 -7032,7 +7086,7 @@@ F:      drivers/media/parport/*-qcam
  RADOS BLOCK DEVICE (RBD)
  M:    Yehuda Sadeh <yehuda@inktank.com>
  M:    Sage Weil <sage@inktank.com>
 -M:    Alex Elder <elder@inktank.com>
 +M:    Alex Elder <elder@kernel.org>
  M:    ceph-devel@vger.kernel.org
  W:    http://ceph.com/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git
@@@ -7153,6 -7105,7 +7159,7 @@@ F:      drivers/net/wireless/ray
  RCUTORTURE MODULE
  M:    Josh Triplett <josh@freedesktop.org>
  M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+ L:    linux-kernel@vger.kernel.org
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
  F:    Documentation/RCU/torture.txt
@@@ -7160,6 -7113,7 +7167,7 @@@ F:      kernel/rcu/torture.
  
  RCUTORTURE TEST FRAMEWORK
  M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+ L:    linux-kernel@vger.kernel.org
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
  F:    tools/testing/selftests/rcutorture
@@@ -7183,6 -7137,7 +7191,7 @@@ F:      net/rds
  READ-COPY UPDATE (RCU)
  M:    Dipankar Sarma <dipankar@in.ibm.com>
  M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+ L:    linux-kernel@vger.kernel.org
  W:    http://www.rdrop.com/users/paulmck/RCU/
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
@@@ -7462,12 -7417,6 +7471,12 @@@ L:    linux-media@vger.kernel.or
  S:    Supported
  F:    drivers/media/i2c/s5c73m3/*
  
 +SAMSUNG SOC CLOCK DRIVERS
 +M:    Tomasz Figa <t.figa@samsung.com>
 +S:    Supported
 +L:    linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
 +F:    drivers/clk/samsung/
 +
  SERIAL DRIVERS
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  L:    linux-serial@vger.kernel.org
@@@ -7492,6 -7441,7 +7501,7 @@@ F:      drivers/mmc/host/dw_mmc
  TIMEKEEPING, CLOCKSOURCE CORE, NTP
  M:    John Stultz <john.stultz@linaro.org>
  M:    Thomas Gleixner <tglx@linutronix.de>
+ L:    linux-kernel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
  S:    Supported
  F:    include/linux/clocksource.h
@@@ -7517,6 -7467,7 +7527,7 @@@ F:      drivers/watchdog/sc1200wdt.
  SCHEDULER
  M:    Ingo Molnar <mingo@redhat.com>
  M:    Peter Zijlstra <peterz@infradead.org>
+ L:    linux-kernel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core
  S:    Maintained
  F:    kernel/sched/
@@@ -7539,7 -7490,7 +7550,7 @@@ S:      Maintaine
  F:    drivers/scsi/sr*
  
  SCSI RDMA PROTOCOL (SRP) INITIATOR
 -M:    David Dillow <dillowda@ornl.gov>
 +M:    Bart Van Assche <bvanassche@acm.org>
  L:    linux-rdma@vger.kernel.org
  S:    Supported
  W:    http://www.openfabrics.org
@@@ -7551,9 -7502,8 +7562,9 @@@ F:      include/scsi/srp.
  SCSI SG DRIVER
  M:    Doug Gilbert <dgilbert@interlog.com>
  L:    linux-scsi@vger.kernel.org
 -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
  
@@@ -7615,7 -7565,7 +7626,7 @@@ S:      Maintaine
  F:    drivers/mmc/host/sdricoh_cs.c
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
 -M:    Chris Ball <cjb@laptop.org>
 +M:    Chris Ball <chris@printf.net>
  L:    linux-mmc@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git
  S:    Maintained
@@@ -7708,7 -7658,7 +7719,7 @@@ F:      drivers/net/ethernet/emulex/benet
  
  SFC NETWORK DRIVER
  M:    Solarflare linux maintainers <linux-net-drivers@solarflare.com>
 -M:    Ben Hutchings <bhutchings@solarflare.com>
 +M:    Shradha Shah <sshah@solarflare.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    drivers/net/ethernet/sfc/
@@@ -7884,6 -7834,7 +7895,7 @@@ F:      mm/sl?b.
  SLEEPABLE READ-COPY UPDATE (SRCU)
  M:    Lai Jiangshan <laijs@cn.fujitsu.com>
  M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+ L:    linux-kernel@vger.kernel.org
  W:    http://www.rdrop.com/users/paulmck/RCU/
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
@@@ -7943,7 -7894,7 +7955,7 @@@ F:      Documentation/hwmon/sch562
  F:    drivers/hwmon/sch5627.c
  
  SMSC47B397 HARDWARE MONITOR DRIVER
 -M:    Jean Delvare <khali@linux-fr.org>
 +M:    Jean Delvare <jdelvare@suse.de>
  L:    lm-sensors@lm-sensors.org
  S:    Maintained
  F:    Documentation/hwmon/smsc47b397
@@@ -8633,7 -8584,6 +8645,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 <vivien.didelot@savoirfairelinux.com>
@@@ -8701,11 -8651,12 +8713,11 @@@ S:   Maintaine
  F:    sound/soc/codecs/twl4030*
  
  TI WILINK WIRELESS DRIVERS
 -M:    Luciano Coelho <luca@coelho.fi>
  L:    linux-wireless@vger.kernel.org
  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
  
@@@ -8774,6 -8725,7 +8786,6 @@@ F:      include/linux/toshiba.
  F:    include/uapi/linux/toshiba.h
  
  TMIO MMC DRIVER
 -M:    Guennadi Liakhovetski <g.liakhovetski@gmx.de>
  M:    Ian Molton <ian@mnementh.co.uk>
  L:    linux-mmc@vger.kernel.org
  S:    Maintained
@@@ -8805,10 -8757,14 +8817,10 @@@ S:   Odd fixe
  F:    drivers/media/usb/tm6000/
  
  TPM DEVICE DRIVER
 -M:    Leonidas Da Silva Barbosa <leosilva@linux.vnet.ibm.com>
 -M:    Ashley Lai <ashley@ashleylai.com>
  M:    Peter Huewe <peterhuewe@gmx.de>
 -M:    Rajiv Andrade <mail@srajiv.net>
 -W:    http://tpmdd.sourceforge.net
 +M:    Ashley Lai <ashley@ashleylai.com>
  M:    Marcel Selhorst <tpmdd@selhorst.net>
 -M:    Sirrix AG <tpmdd@sirrix.com>
 -W:    http://www.sirrix.com
 +W:    http://tpmdd.sourceforge.net
  L:    tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/char/tpm/
@@@ -8960,7 -8916,7 +8972,7 @@@ UNSORTED BLOCK IMAGES (UBI
  M:    Artem Bityutskiy <dedekind1@gmail.com>
  W:    http://www.linux-mtd.infradead.org/
  L:    linux-mtd@lists.infradead.org
 -T:    git git://git.infradead.org/ubi-2.6.git
 +T:    git git://git.infradead.org/ubifs-2.6.git
  S:    Maintained
  F:    drivers/mtd/ubi/
  F:    include/linux/mtd/ubi.h
@@@ -9461,7 -9417,7 +9473,7 @@@ F:      Documentation/hwmon/w8379
  F:    drivers/hwmon/w83793.c
  
  W83795 HARDWARE MONITORING DRIVER
 -M:    Jean Delvare <khali@linux-fr.org>
 +M:    Jean Delvare <jdelvare@suse.de>
  L:    lm-sensors@lm-sensors.org
  S:    Maintained
  F:    drivers/hwmon/w83795.c
@@@ -9587,6 -9543,7 +9599,7 @@@ M:      Thomas Gleixner <tglx@linutronix.de
  M:    Ingo Molnar <mingo@redhat.com>
  M:    "H. Peter Anvin" <hpa@zytor.com>
  M:    x86@kernel.org
+ L:    linux-kernel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
  S:    Maintained
  F:    Documentation/x86/
@@@ -9619,7 -9576,6 +9632,7 @@@ M:      Konrad Rzeszutek Wilk <konrad.wilk@o
  M:    Boris Ostrovsky <boris.ostrovsky@oracle.com>
  M:    David Vrabel <david.vrabel@citrix.com>
  L:    xen-devel@lists.xenproject.org (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
@@@ -9740,27 -9696,11 +9753,27 @@@ T:   Mercurial http://linuxtv.org/hg/v4l-
  S:    Odd Fixes
  F:    drivers/media/pci/zoran/
  
 +ZRAM COMPRESSED RAM BLOCK DEVICE DRVIER
 +M:    Minchan Kim <minchan@kernel.org>
 +M:    Nitin Gupta <ngupta@vflare.org>
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +F:    drivers/block/zram/
 +F:    Documentation/blockdev/zram.txt
 +
  ZS DECSTATION Z85C30 SERIAL DRIVER
  M:    "Maciej W. Rozycki" <macro@linux-mips.org>
  S:    Maintained
  F:    drivers/tty/serial/zs.*
  
 +ZSMALLOC COMPRESSED SLAB MEMORY ALLOCATOR
 +M:    Minchan Kim <minchan@kernel.org>
 +M:    Nitin Gupta <ngupta@vflare.org>
 +L:    linux-mm@kvack.org
 +S:    Maintained
 +F:    mm/zsmalloc.c
 +F:    include/linux/zsmalloc.h
 +
  ZSWAP COMPRESSED SWAP CACHING
  M:    Seth Jennings <sjenning@linux.vnet.ibm.com>
  L:    linux-mm@kvack.org

diff --combined include/linux/sched/sysctl.h
index b13cf430764f76cc4053f1c935e1e417a32188a1,3a93f842306a80460b998673af36893d9d4705bb..8045a554cafb87074a29ab7e73f9255681744bf5
--- 1/include/linux/sched/sysctl.h
--- 2/include/linux/sched/sysctl.h
+++ b/include/linux/sched/sysctl.h
@@@ -5,7 -5,7 +5,7 @@@
  extern int         sysctl_hung_task_check_count;
  extern unsigned int  sysctl_hung_task_panic;
  extern unsigned long sysctl_hung_task_timeout_secs;
- extern unsigned long sysctl_hung_task_warnings;
+ extern int sysctl_hung_task_warnings;
  extern int proc_dohung_task_timeout_secs(struct ctl_table *table, int write,
                                         void __user *buffer,
                                         size_t *lenp, loff_t *ppos);
@@@ -99,8 -99,4 +99,8 @@@ extern int sched_rt_handler(struct ctl_
                void __user *buffer, size_t *lenp,
                loff_t *ppos);
  
 +extern int sysctl_numa_balancing(struct ctl_table *table, int write,
 +                               void __user *buffer, size_t *lenp,
 +                               loff_t *ppos);
 +
  #endif /* _SCHED_SYSCTL_H */

diff --combined kernel/sysctl.c
index 096db7452cbd29c8250a49741d3c8b210b82cf74,dd5b4496637e284009a0e34280e98d88772f91f8..49e13e1f8fe6a5e481edb3026ae20360918986c3
--- 1/kernel/sysctl.c
--- 2/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@@ -62,7 -62,6 +62,7 @@@
  #include <linux/capability.h>
  #include <linux/binfmts.h>
  #include <linux/sched/sysctl.h>
 +#include <linux/kexec.h>
  
  #include <asm/uaccess.h>
  #include <asm/processor.h>
@@@ -96,6 -95,8 +96,6 @@@
  #if defined(CONFIG_SYSCTL)
  
  /* External variables not in a header file. */
 -extern int sysctl_overcommit_memory;
 -extern int sysctl_overcommit_ratio;
  extern int max_threads;
  extern int suid_dumpable;
  #ifdef CONFIG_COREDUMP
@@@ -121,6 -122,8 +121,8 @@@ extern int blk_iopoll_enabled
  static int sixty = 60;
  #endif
  
+ static int __maybe_unused neg_one = -1;
+ 
  static int zero;
  static int __maybe_unused one = 1;
  static int __maybe_unused two = 2;
@@@ -390,15 -393,6 +392,15 @@@ static struct ctl_table kern_table[] = 
                .mode           = 0644,
                .proc_handler   = proc_dointvec,
        },
 +      {
 +              .procname       = "numa_balancing",
 +              .data           = NULL, /* filled in by handler */
 +              .maxlen         = sizeof(unsigned int),
 +              .mode           = 0644,
 +              .proc_handler   = sysctl_numa_balancing,
 +              .extra1         = &zero,
 +              .extra2         = &one,
 +      },
  #endif /* CONFIG_NUMA_BALANCING */
  #endif /* CONFIG_SCHED_DEBUG */
        {
@@@ -615,18 -609,6 +617,18 @@@
                .proc_handler   = proc_dointvec,
        },
  #endif
 +#ifdef CONFIG_KEXEC
 +      {
 +              .procname       = "kexec_load_disabled",
 +              .data           = &kexec_load_disabled,
 +              .maxlen         = sizeof(int),
 +              .mode           = 0644,
 +              /* only handle a transition from default "0" to "1" */
 +              .proc_handler   = proc_dointvec_minmax,
 +              .extra1         = &one,
 +              .extra2         = &one,
 +      },
 +#endif
  #ifdef CONFIG_MODULES
        {
                .procname       = "modprobe",
@@@ -997,9 -979,10 +999,10 @@@
        {
                .procname       = "hung_task_warnings",
                .data           = &sysctl_hung_task_warnings,
-               .maxlen         = sizeof(unsigned long),
+               .maxlen         = sizeof(int),
                .mode           = 0644,
-               .proc_handler   = proc_doulongvec_minmax,
+               .proc_handler   = proc_dointvec_minmax,
+               .extra1         = &neg_one,
        },
  #endif
  #ifdef CONFIG_COMPAT
@@@ -1141,14 -1124,7 +1144,14 @@@ static struct ctl_table vm_table[] = 
                .data           = &sysctl_overcommit_ratio,
                .maxlen         = sizeof(sysctl_overcommit_ratio),
                .mode           = 0644,
 -              .proc_handler   = proc_dointvec,
 +              .proc_handler   = overcommit_ratio_handler,
 +      },
 +      {
 +              .procname       = "overcommit_kbytes",
 +              .data           = &sysctl_overcommit_kbytes,
 +              .maxlen         = sizeof(sysctl_overcommit_kbytes),
 +              .mode           = 0644,
 +              .proc_handler   = overcommit_kbytes_handler,
        },
        {
                .procname       = "page-cluster",