Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

author Linus Torvalds <torvalds@linux-foundation.org>

Sun, 24 Jan 2016 20:50:56 +0000 (12:50 -0800)

committer Linus Torvalds <torvalds@linux-foundation.org>

Sun, 24 Jan 2016 20:50:56 +0000 (12:50 -0800)
author Linus Torvalds <torvalds@linux-foundation.org>
Sun, 24 Jan 2016 20:50:56 +0000 (12:50 -0800)
committer Linus Torvalds <torvalds@linux-foundation.org>
Sun, 24 Jan 2016 20:50:56 +0000 (12:50 -0800)
diff --combined Documentation/kernel-parameters.txt

index cfb2c0f1a4a89237ce131999d7b1cc03aff178b4,4bcd23355e8676af6ed12b6c0f10effb2038e4a5..87d40a72f6a1bec998be718138347a875c00117a
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -472,15 -472,6 +472,15 @@@ bytes respectively. Such letter suffixe
                         Change the amount of debugging information output
                         when initialising the APIC and IO-APIC components.
   
+ +      apic_extnmi=    [APIC,X86] External NMI delivery setting
+ +                      Format: { bsp (default) | all | none }
+ +                      bsp:  External NMI is delivered only to CPU 0
+ +                      all:  External NMIs are broadcast to all CPUs as a
+ +                            backup of CPU 0
+ +                      none: External NMI is masked for all CPUs. This is
+ +                            useful so that a dump capture kernel won't be
+ +                            shot down by NMI
+ +
         autoconf=       [IPV6]
                         See Documentation/networking/ipv6.txt.
   
@@@ -608,11 -599,6 +608,11 @@@
                         cut the overhead, others just disable the usage. So
                         only cgroup_disable=memory is actually worthy}
   
+ +      cgroup.memory=  [KNL] Pass options to the cgroup memory controller.
+ +                      Format: <string>
+ +                      nosocket -- Disable socket memory accounting.
+ +                      nokmem -- Disable kernel memory accounting.
+ +
         checkreqprot    [SELINUX] Set initial checkreqprot flag value.
                         Format: { "0" | "1" }
                         See security/selinux/Kconfig help text.
@@@ -735,17 -721,16 +735,17 @@@
   
                 uart[8250],io,<addr>[,options]
                 uart[8250],mmio,<addr>[,options]
+ +              uart[8250],mmio16,<addr>[,options]
                 uart[8250],mmio32,<addr>[,options]
                 uart[8250],0x<addr>[,options]
                         Start an early, polled-mode console on the 8250/16550
                         UART at the specified I/O port or MMIO address,
                         switching to the matching ttyS device later.
                         MMIO inter-register address stride is either 8-bit
- -                      (mmio) or 32-bit (mmio32).
- -                      If none of [io|mmio|mmio32], <addr> is assumed to be
- -                      equivalent to 'mmio'. 'options' are specified in the
- -                      same format described for ttyS above; if unspecified,
+ +                      (mmio), 16-bit (mmio16), or 32-bit (mmio32).
+ +                      If none of [io|mmio|mmio16|mmio32], <addr> is assumed
+ +                      to be equivalent to 'mmio'. 'options' are specified in
+ +                      the same format described for ttyS above; if unspecified,
                         the h/w is not re-initialized.
   
                 hvc<n>  Use the hypervisor console device <n>. This is for
@@@ -1017,13 -1002,10 +1017,13 @@@
                         unspecified, the h/w is not initialized.
   
                 pl011,<addr>
+ +              pl011,mmio32,<addr>
                         Start an early, polled-mode console on a pl011 serial
                         port at the specified address. The pl011 serial port
                         must already be setup and configured. Options are not
- -                      yet supported.
+ +                      yet supported.  If 'mmio32' is specified, then only
+ +                      the driver will use only 32-bit accessors to read/write
+ +                      the device registers.
   
                 msm_serial,<addr>
                         Start an early, polled-mode console on an msm serial
@@@ -1454,6 -1436,41 +1454,41 @@@
                         In such case C2/C3 won't be used again.
                         idle=nomwait: Disable mwait for CPU C-states
   
+       ieee754=        [MIPS] Select IEEE Std 754 conformance mode
+                       Format: { strict | legacy | 2008 | relaxed }
+                       Default: strict
+ 
+                       Choose which programs will be accepted for execution
+                       based on the IEEE 754 NaN encoding(s) supported by
+                       the FPU and the NaN encoding requested with the value
+                       of an ELF file header flag individually set by each
+                       binary.  Hardware implementations are permitted to
+                       support either or both of the legacy and the 2008 NaN
+                       encoding mode.
+ 
+                       Available settings are as follows:
+                       strict  accept binaries that request a NaN encoding
+                               supported by the FPU
+                       legacy  only accept legacy-NaN binaries, if supported
+                               by the FPU
+                       2008    only accept 2008-NaN binaries, if supported
+                               by the FPU
+                       relaxed accept any binaries regardless of whether
+                               supported by the FPU
+ 
+                       The FPU emulator is always able to support both NaN
+                       encodings, so if no FPU hardware is present or it has
+                       been disabled with 'nofpu', then the settings of
+                       'legacy' and '2008' strap the emulator accordingly,
+                       'relaxed' straps the emulator for both legacy-NaN and
+                       2008-NaN, whereas 'strict' enables legacy-NaN only on
+                       legacy processors and both NaN encodings on MIPS32 or
+                       MIPS64 CPUs.
+ 
+                       The setting for ABS.fmt/NEG.fmt instruction execution
+                       mode generally follows that for the NaN encoding,
+                       except where unsupported by hardware.
+ 
         ignore_loglevel [KNL]
                         Ignore loglevel setting - this will print /all/
                         kernel messages to the console. Useful for debugging.
@@@ -2593,6 -2610,8 +2628,6 @@@
   
         notsc           [BUGS=X86-32] Disable Time Stamp Counter
   
- -      nousb           [USB] Disable the USB subsystem
- -
         nowatchdog      [KNL] Disable both lockup detectors, i.e.
                           soft-lockup and NMI watchdog (hard-lockup).
   
@@@ -2749,16 -2768,10 +2784,16 @@@
                                 hardware access methods are allowed. Use this
                                 if you experience crashes upon bootup and you
                                 suspect they are caused by the BIOS.
- -              conf1           [X86] Force use of PCI Configuration
- -                              Mechanism 1.
- -              conf2           [X86] Force use of PCI Configuration
- -                              Mechanism 2.
+ +              conf1           [X86] Force use of PCI Configuration Access
+ +                              Mechanism 1 (config address in IO port 0xCF8,
+ +                              data in IO port 0xCFC, both 32-bit).
+ +              conf2           [X86] Force use of PCI Configuration Access
+ +                              Mechanism 2 (IO port 0xCF8 is an 8-bit port for
+ +                              the function, IO port 0xCFA, also 8-bit, sets
+ +                              bus number. The config space is then accessed
+ +                              through ports 0xC000-0xCFFF).
+ +                              See http://wiki.osdev.org/PCI for more info
+ +                              on the configuration access mechanisms.
                 noaer           [PCIE] If the PCIEAER kernel config parameter is
                                 enabled, this kernel boot option can be used to
                                 disable the use of PCIE advanced error reporting.
@@@ -3000,12 -3013,6 +3035,12 @@@
                         may be specified.
                         Format: <port>,<port>....
   
+ +      ppc_strict_facility_enable
+ +                      [PPC] This option catches any kernel floating point,
+ +                      Altivec, VSX and SPE outside of regions specifically
+ +                      allowed (eg kernel_enable_fpu()/kernel_disable_fpu()).
+ +                      There is some performance impact when enabling this.
+ +
         print-fatal-signals=
                         [KNL] debug: print fatal signals
   
@@@ -3078,6 -3085,9 +3113,6 @@@
         raid=           [HW,RAID]
                         See Documentation/md.txt.
   
- -      ramdisk_blocksize=      [RAM]
- -                      See Documentation/blockdev/ramdisk.txt.
- -
         ramdisk_size=   [RAM] Sizes of RAM disks in kilobytes
                         See Documentation/blockdev/ramdisk.txt.
   
@@@ -3321,35 -3331,18 +3356,35 @@@
         rcutorture.verbose= [KNL]
                         Enable additional printk() statements.
   
+ +      rcupdate.rcu_cpu_stall_suppress= [KNL]
+ +                      Suppress RCU CPU stall warning messages.
+ +
+ +      rcupdate.rcu_cpu_stall_timeout= [KNL]
+ +                      Set timeout for RCU CPU stall warning messages.
+ +
         rcupdate.rcu_expedited= [KNL]
                         Use expedited grace-period primitives, for
                         example, synchronize_rcu_expedited() instead
                         of synchronize_rcu().  This reduces latency,
                         but can increase CPU utilization, degrade
                         real-time latency, and degrade energy efficiency.
- -
- -      rcupdate.rcu_cpu_stall_suppress= [KNL]
- -                      Suppress RCU CPU stall warning messages.
- -
- -      rcupdate.rcu_cpu_stall_timeout= [KNL]
- -                      Set timeout for RCU CPU stall warning messages.
+ +                      No effect on CONFIG_TINY_RCU kernels.
+ +
+ +      rcupdate.rcu_normal= [KNL]
+ +                      Use only normal grace-period primitives,
+ +                      for example, synchronize_rcu() instead of
+ +                      synchronize_rcu_expedited().  This improves
+ +                      real-time latency, CPU utilization, and
+ +                      energy efficiency, but can expose users to
+ +                      increased grace-period latency.  This parameter
+ +                      overrides rcupdate.rcu_expedited.  No effect on
+ +                      CONFIG_TINY_RCU kernels.
+ +
+ +      rcupdate.rcu_normal_after_boot= [KNL]
+ +                      Once boot has completed (that is, after
+ +                      rcu_end_inkernel_boot() has been invoked), use
+ +                      only normal grace-period primitives.  No effect
+ +                      on CONFIG_TINY_RCU kernels.
   
         rcupdate.rcu_task_stall_timeout= [KNL]
                         Set timeout in jiffies for RCU task stall warning
@@@ -3916,10 -3909,6 +3951,10 @@@
         usbcore.usbfs_snoop=
                         [USB] Set to log all usbfs traffic (default 0 = off).
   
+ +      usbcore.usbfs_snoop_max=
+ +                      [USB] Maximum number of bytes to snoop in each URB
+ +                      (default = 65536).
+ +
         usbcore.blinkenlights=
                         [USB] Set to cycle leds on hubs (default 0 = off).
   
@@@ -3940,8 -3929,6 +3975,8 @@@
                           USB_REQ_GET_DESCRIPTOR request in milliseconds
                         (default 5000 = 5.0 seconds).
   
+ +      usbcore.nousb   [USB] Disable the USB subsystem
+ +
         usbhid.mousepoll=
                         [USBHID] The interval which mice are to be polled at.
   
@@@ -4162,15 -4149,6 +4197,15 @@@
                         or other driver-specific files in the
                         Documentation/watchdog/ directory.
   
+ +      workqueue.watchdog_thresh=
+ +                      If CONFIG_WQ_WATCHDOG is configured, workqueue can
+ +                      warn stall conditions and dump internal state to
+ +                      help debugging.  0 disables workqueue stall
+ +                      detection; otherwise, it's the stall threshold
+ +                      duration in seconds.  The default value is 30 and
+ +                      it can be updated at runtime by writing to the
+ +                      corresponding sysfs file.
+ +
         workqueue.disable_numa
                         By default, all work items queued to unbound
                         workqueues are affine to the NUMA nodes they're
diff --combined MAINTAINERS

index 78f71f471bd6df1fb3ca31ff6e32240f4dbdb90a,069406de5b14814bc9f8ac6747456671df685205..30aca4aa5467b53d6a171a27b57a4357fa09127b
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -206,7 -206,7 +206,7 @@@ F: include/trace/events/9p.
   A8293 MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -240,12 -240,6 +240,12 @@@ L:       lm-sensors@lm-sensors.or
   S:    Maintained
   F:    drivers/hwmon/abituguru3.c
   
+ +ACCES 104-IDI-48 GPIO DRIVER
+ +M:    "William Breathitt Gray" <vilhelm.gray@gmail.com>
+ +L:    linux-gpio@vger.kernel.org
+ +S:    Maintained
+ +F:    drivers/gpio/gpio-104-idi-48.c
+ +
   ACCES 104-IDIO-16 GPIO DRIVER
   M:    "William Breathitt Gray" <vilhelm.gray@gmail.com>
   L:    linux-gpio@vger.kernel.org
@@@ -377,15 -371,6 +377,15 @@@ ADDRESS SPACE LAYOUT RANDOMIZATION (ASL
   M:    Jiri Kosina <jikos@kernel.org>
   S:    Maintained
   
+ +ADF7242 IEEE 802.15.4 RADIO DRIVER
+ +M:    Michael Hennerich <michael.hennerich@analog.com>
+ +W:    https://wiki.analog.com/ADF7242
+ +W:    http://ez.analog.com/community/linux-device-drivers
+ +L:    linux-wpan@vger.kernel.org
+ +S:    Supported
+ +F:    drivers/net/ieee802154/adf7242.c
+ +F:    Documentation/devicetree/bindings/net/ieee802154/adf7242.txt
+ +
   ADM1025 HARDWARE MONITOR DRIVER
   M:    Jean Delvare <jdelvare@suse.com>
   L:    lm-sensors@lm-sensors.org
@@@ -403,14 -388,14 +403,14 @@@ ADM8211 WIRELESS DRIVE
   L:    linux-wireless@vger.kernel.org
   W:    http://wireless.kernel.org/
   S:    Orphan
- -F:    drivers/net/wireless/adm8211.*
+ +F:    drivers/net/wireless/admtek/adm8211.*
   
   ADP1653 FLASH CONTROLLER DRIVER
   M:    Sakari Ailus <sakari.ailus@iki.fi>
   L:    linux-media@vger.kernel.org
   S:    Maintained
   F:    drivers/media/i2c/adp1653.c
- -F:    include/media/adp1653.h
+ +F:    include/media/i2c/adp1653.h
   
   ADP5520 BACKLIGHT DRIVER WITH IO EXPANDER (ADP5520/ADP5501)
   M:    Michael Hennerich <michael.hennerich@analog.com>
@@@ -481,7 -466,7 +481,7 @@@ F: sound/oss/aedsp16.
   AF9013 MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -491,7 -476,7 +491,7 @@@ F: drivers/media/dvb-frontends/af9013
   AF9033 MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -537,7 -522,7 +537,7 @@@ AIMSLAB FM RADIO RECEIVER DRIVE
   M:    Hans Verkuil <hverkuil@xs4all.nl>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   S:    Maintained
   F:    drivers/media/radio/radio-aimslab*
   
@@@ -551,7 -536,7 +551,7 @@@ F: include/linux/*aio*.
   AIRSPY MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -629,9 -614,9 +629,9 @@@ F: drivers/crypto/ccp
   F:    include/linux/ccp.h
   
   AMD FAM15H PROCESSOR POWER MONITORING DRIVER
- -M:    Andreas Herrmann <herrmann.der.user@googlemail.com>
+ +M:    Huang Rui <ray.huang@amd.com>
   L:    lm-sensors@lm-sensors.org
- -S:    Maintained
+ +S:    Supported
   F:    Documentation/hwmon/fam15h_power
   F:    drivers/hwmon/fam15h_power.c
   
@@@ -781,7 -766,6 +781,7 @@@ F: sound/aoa
   APM DRIVER
   M:    Jiri Kosina <jikos@kernel.org>
   S:    Odd fixes
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git
   F:    arch/x86/kernel/apm_32.c
   F:    include/linux/apm_bios.h
   F:    include/uapi/linux/apm_bios.h
@@@ -947,7 -931,6 +947,7 @@@ M: Alexandre Belloni <alexandre.belloni
   M:    Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   W:    http://www.linux4sam.org
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git
   S:    Supported
   F:    arch/arm/mach-at91/
   F:    include/soc/at91/
@@@ -1417,13 -1400,12 +1417,13 @@@ W:   http://www.arm.linux.org.uk
   S:    Maintained
   
   ARM/QUALCOMM SUPPORT
- -M:    Kumar Gala <galak@codeaurora.org>
- -M:    Andy Gross <agross@codeaurora.org>
- -M:    David Brown <davidb@codeaurora.org>
+ +M:    Andy Gross <andy.gross@linaro.org>
+ +M:    David Brown <david.brown@linaro.org>
   L:    linux-arm-msm@vger.kernel.org
   L:    linux-soc@vger.kernel.org
   S:    Maintained
+ +F:    arch/arm/boot/dts/qcom-*.dts
+ +F:    arch/arm/boot/dts/qcom-*.dtsi
   F:    arch/arm/mach-qcom/
   F:    drivers/soc/qcom/
   F:    drivers/tty/serial/msm_serial.h
@@@ -1431,22 -1413,13 +1431,22 @@@ F:   drivers/tty/serial/msm_serial.
   F:    drivers/*/pm8???-*
   F:    drivers/mfd/ssbi.c
   F:    drivers/firmware/qcom_scm.c
- -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git
   
   ARM/RADISYS ENP2611 MACHINE SUPPORT
   M:    Lennert Buytenhek <kernel@wantstofly.org>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   S:    Maintained
   
+ +ARM/RENESAS ARM64 ARCHITECTURE
+ +M:    Simon Horman <horms@verge.net.au>
+ +M:    Magnus Damm <magnus.damm@gmail.com>
+ +L:    linux-sh@vger.kernel.org
+ +Q:    http://patchwork.kernel.org/project/linux-sh/list/
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
+ +S:    Supported
+ +F:    arch/arm64/boot/dts/renesas/
+ +
   ARM/RISCPC ARCHITECTURE
   M:    Russell King <linux@arm.linux.org.uk>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1466,7 -1439,6 +1466,7 @@@ ARM/Rockchip SoC suppor
   M:    Heiko Stuebner <heiko@sntech.de>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   L:    linux-rockchip@lists.infradead.org
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
   S:    Maintained
   F:    arch/arm/boot/dts/rk3*
   F:    arch/arm/mach-rockchip/
@@@ -1544,8 -1516,9 +1544,8 @@@ F:      drivers/media/platform/s5p-jpeg
   ARM/SHMOBILE ARM ARCHITECTURE
   M:    Simon Horman <horms@verge.net.au>
   M:    Magnus Damm <magnus.damm@gmail.com>
- -L:    linux-sh@vger.kernel.org
- -W:    http://oss.renesas.com
- -Q:    http://patchwork.kernel.org/project/linux-sh/list/
+ +L:    linux-renesas-soc@vger.kernel.org
+ +Q:    http://patchwork.kernel.org/project/linux-renesas-soc/list/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
   S:    Supported
   F:    arch/arm/boot/dts/emev2*
@@@ -1615,13 -1588,6 +1615,13 @@@ T:    git git://git.kernel.org/pub/scm/lin
   N:    stm32
   F:    drivers/clocksource/armv7m_systick.c
   
+ +ARM/TANGO ARCHITECTURE
+ +M:    Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
+ +L:    linux-arm-kernel@lists.infradead.org
+ +S:    Maintained
+ +F:    arch/arm/mach-tango/
+ +F:    arch/arm/boot/dts/tango*
+ +
   ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
   M:    Lennert Buytenhek <kernel@wantstofly.org>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1676,8 -1642,6 +1676,8 @@@ F:      arch/arm/boot/dts/uniphier
   F:    arch/arm/include/asm/hardware/cache-uniphier.h
   F:    arch/arm/mach-uniphier/
   F:    arch/arm/mm/cache-uniphier.c
+ +F:    arch/arm64/boot/dts/socionext/
+ +F:    drivers/bus/uniphier-system-bus.c
   F:    drivers/i2c/busses/i2c-uniphier*
   F:    drivers/pinctrl/uniphier/
   F:    drivers/tty/serial/8250/8250_uniphier.c
@@@ -1799,7 -1763,6 +1799,7 @@@ ARM64 PORT (AARCH64 ARCHITECTURE
   M:    Catalin Marinas <catalin.marinas@arm.com>
   M:    Will Deacon <will.deacon@arm.com>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git
   S:    Maintained
   F:    arch/arm64/
   F:    Documentation/arm64/
@@@ -1810,7 -1773,7 +1810,7 @@@ L:      linux-media@vger.kernel.or
   T:    git git://linuxtv.org/media_tree.git
   S:    Maintained
   F:    drivers/media/i2c/as3645a.c
- -F:    include/media/as3645a.h
+ +F:    include/media/i2c/as3645a.h
   
   ASC7621 HARDWARE MONITOR DRIVER
   M:    George Joseph <george.joseph@fairview5.com>
@@@ -1828,12 -1791,6 +1828,12 @@@ S:    Maintaine
   F:    drivers/platform/x86/asus*.c
   F:    drivers/platform/x86/eeepc*.c
   
+ +ASUS WIRELESS RADIO CONTROL DRIVER
+ +M:    João Paulo Rechi Vita <jprvita@gmail.com>
+ +L:    platform-driver-x86@vger.kernel.org
+ +S:    Maintained
+ +F:    drivers/platform/x86/asus-wireless.c
+ +
   ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
   R:    Dan Williams <dan.j.williams@intel.com>
   W:    http://sourceforge.net/projects/xscaleiop
@@@ -1885,7 -1842,7 +1885,7 @@@ ATHEROS ATH6KL WIRELESS DRIVE
   M:    Kalle Valo <kvalo@qca.qualcomm.com>
   L:    linux-wireless@vger.kernel.org
   W:    http://wireless.kernel.org/en/users/Drivers/ath6kl
- -T:    git git://github.com/kvalo/ath.git
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
   S:    Supported
   F:    drivers/net/wireless/ath/ath6kl/
   
@@@ -1939,6 -1896,7 +1939,6 @@@ ATMEL AT91 / AT32 MCI DRIVE
   M:    Ludovic Desroches <ludovic.desroches@atmel.com>
   S:    Maintained
   F:    drivers/mmc/host/atmel-mci.c
- -F:    drivers/mmc/host/atmel-mci-regs.h
   
   ATMEL AT91 / AT32 SERIAL DRIVER
   M:    Nicolas Ferre <nicolas.ferre@atmel.com>
@@@ -2035,7 -1993,7 +2035,7 @@@ L:      linux-wireless@vger.kernel.or
   W:    http://www.thekelleys.org.uk/atmel
   W:    http://atmelwlandriver.sourceforge.net/
   S:    Maintained
- -F:    drivers/net/wireless/atmel*
+ +F:    drivers/net/wireless/atmel/atmel*
   
   ATMEL MAXTOUCH DRIVER
   M:    Nick Dyer <nick.dyer@itdev.co.uk>
@@@ -2106,7 -2064,7 +2106,7 @@@ F:      net/ax25
   AZ6007 DVB DRIVER
   M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   T:    git git://linuxtv.org/media_tree.git
   S:    Maintained
   F:    drivers/media/usb/dvb-usb-v2/az6007.c
@@@ -2115,7 -2073,7 +2115,7 @@@ AZTECH FM RADIO RECEIVER DRIVE
   M:    Hans Verkuil <hverkuil@xs4all.nl>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   S:    Maintained
   F:    drivers/media/radio/radio-aztech*
   
@@@ -2124,7 -2082,7 +2124,7 @@@ L:      linux-wireless@vger.kernel.or
   L:    b43-dev@lists.infradead.org
   W:    http://wireless.kernel.org/en/users/Drivers/b43
   S:    Odd Fixes
- -F:    drivers/net/wireless/b43/
+ +F:    drivers/net/wireless/broadcom/b43/
   
   B43LEGACY WIRELESS DRIVER
   M:    Larry Finger <Larry.Finger@lwfinger.net>
@@@ -2132,12 -2090,11 +2132,12 @@@ L:   linux-wireless@vger.kernel.or
   L:    b43-dev@lists.infradead.org
   W:    http://wireless.kernel.org/en/users/Drivers/b43
   S:    Maintained
- -F:    drivers/net/wireless/b43legacy/
+ +F:    drivers/net/wireless/broadcom/b43legacy/
   
   BACKLIGHT CLASS/SUBSYSTEM
   M:    Jingoo Han <jingoohan1@gmail.com>
   M:    Lee Jones <lee.jones@linaro.org>
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git
   S:    Maintained
   F:    drivers/video/backlight/
   F:    include/linux/backlight.h
@@@ -2145,7 -2102,7 +2145,7 @@@
   BATMAN ADVANCED
   M:    Marek Lindner <mareklindner@neomailbox.ch>
   M:    Simon Wunderlich <sw@simonwunderlich.de>
- -M:    Antonio Quartulli <antonio@meshcoding.com>
+ +M:    Antonio Quartulli <a@unstable.cc>
   L:    b.a.t.m.a.n@lists.open-mesh.org
   W:    http://www.open-mesh.org/
   S:    Maintained
@@@ -2169,7 -2126,7 +2169,7 @@@ BDISP ST MEDIA DRIVE
   M:    Fabien Dessenne <fabien.dessenne@st.com>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   S:    Supported
   F:    drivers/media/platform/sti/bdisp
   
@@@ -2400,7 -2357,6 +2400,7 @@@ M:      Brian Norris <computersforpeace@gmai
   M:    Gregory Fong <gregory.0xf0@gmail.com>
   M:    Florian Fainelli <f.fainelli@gmail.com>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ +L:    bcm-kernel-feedback-list@broadcom.com
   T:    git git://github.com/broadcom/stblinux.git
   S:    Maintained
   F:    arch/arm/mach-bcm/*brcmstb*
@@@ -2420,6 -2376,8 +2420,8 @@@ F:      arch/mips/kernel/*bmips
   F:    arch/mips/boot/dts/brcm/bcm*.dts*
   F:    drivers/irqchip/irq-bcm7*
   F:    drivers/irqchip/irq-brcmstb*
+ F:    include/linux/bcm963xx_nvram.h
+ F:    include/linux/bcm963xx_tag.h
   
   BROADCOM TG3 GIGABIT ETHERNET DRIVER
   M:    Prashant Sreedharan <prashant@broadcom.com>
@@@ -2436,7 -2394,7 +2438,7 @@@ M:      Hante Meuleman <meuleman@broadcom.co
   L:    linux-wireless@vger.kernel.org
   L:    brcm80211-dev-list@broadcom.com
   S:    Supported
- -F:    drivers/net/wireless/brcm80211/
+ +F:    drivers/net/wireless/broadcom/brcm80211/
   
   BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
   M:    QLogic-Storage-Upstream@qlogic.com
@@@ -2474,7 -2432,7 +2476,7 @@@ N:      bcm8831
   
   BROADCOM BRCMSTB GPIO DRIVER
   M:    Gregory Fong <gregory.0xf0@gmail.com>
- -L:    bcm-kernel-feedback-list@broadcom.com>
+ +L:    bcm-kernel-feedback-list@broadcom.com
   S:    Supported
   F:    drivers/gpio/gpio-brcmstb.c
   F:    Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt
@@@ -2563,7 -2521,7 +2565,7 @@@ F:      fs/btrfs
   BTTV VIDEO4LINUX DRIVER
   M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   T:    git git://linuxtv.org/media_tree.git
   S:    Odd fixes
   F:    Documentation/video4linux/bttv/
@@@ -2602,7 -2560,7 +2604,7 @@@ CADET FM/AM RADIO RECEIVER DRIVE
   M:    Hans Verkuil <hverkuil@xs4all.nl>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   S:    Maintained
   F:    drivers/media/radio/radio-cadet*
   
@@@ -2736,11 -2694,10 +2738,11 @@@ F:   fs/ceph
   CERTIFICATE HANDLING:
   M:    David Howells <dhowells@redhat.com>
   M:    David Woodhouse <dwmw2@infradead.org>
- -L:    keyrings@linux-nfs.org
+ +L:    keyrings@vger.kernel.org
   S:    Maintained
   F:    Documentation/module-signing.txt
   F:    certs/
+ +F:    scripts/sign-file.c
   F:    scripts/extract-cert.c
   
   CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
@@@ -2804,7 -2761,7 +2806,7 @@@ S:      Maintaine
   F:    Documentation/zh_CN/
   
   CHIPIDEA USB HIGH SPEED DUAL ROLE CONTROLLER
- -M:    Peter Chen <Peter.Chen@freescale.com>
+ +M:    Peter Chen <Peter.Chen@nxp.com>
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
   L:    linux-usb@vger.kernel.org
   S:    Maintained
@@@ -2820,7 -2777,6 +2822,7 @@@ F:      drivers/input/touchscreen/chipone_ic
   CHROME HARDWARE PLATFORM SUPPORT
   M:    Olof Johansson <olof@lixom.net>
   S:    Maintained
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform.git
   F:    drivers/platform/chrome/
   
   CISCO VIC ETHERNET NIC DRIVER
@@@ -2897,7 -2853,7 +2899,7 @@@ COBALT MEDIA DRIVE
   M:    Hans Verkuil <hans.verkuil@cisco.com>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   S:    Supported
   F:    drivers/media/pci/cobalt/
   
@@@ -2985,8 -2941,7 +2987,8 @@@ F:      drivers/usb/atm/cxacru.
   
   CONFIGFS
   M:    Joel Becker <jlbec@evilplan.org>
- -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git
+ +M:    Christoph Hellwig <hch@lst.de>
+ +T:    git git://git.infradead.org/users/hch/configfs.git
   S:    Supported
   F:    fs/configfs/
   F:    include/linux/configfs.h
@@@ -3119,7 -3074,6 +3121,7 @@@ M:      Mikael Starvik <starvik@axis.com
   M:    Jesper Nilsson <jesper.nilsson@axis.com>
   L:    linux-cris-kernel@axis.com
   W:    http://developer.axis.com
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git
   S:    Maintained
   F:    arch/cris/
   F:    drivers/tty/serial/crisv10.*
@@@ -3128,7 -3082,6 +3130,7 @@@ CRYPTO AP
   M:    Herbert Xu <herbert@gondor.apana.org.au>
   M:    "David S. Miller" <davem@davemloft.net>
   L:    linux-crypto@vger.kernel.org
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
   S:    Maintained
   F:    Documentation/crypto/
@@@ -3145,15 -3098,6 +3147,15 @@@ S:    Maintaine
   F:    crypto/ansi_cprng.c
   F:    crypto/rng.c
   
+ +CS3308 MEDIA 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/i2c/cs3308.c
+ +F:    drivers/media/i2c/cs3308.h
+ +
   CS5535 Audio ALSA driver
   M:    Jaya Kumar <jayakumar.alsa@gmail.com>
   S:    Maintained
@@@ -3162,14 -3106,14 +3164,14 @@@ F:   sound/pci/cs5535audio
   CW1200 WLAN driver
   M:    Solomon Peachy <pizza@shaftnet.org>
   S:    Maintained
- -F:    drivers/net/wireless/cw1200/
+ +F:    drivers/net/wireless/st/cw1200/
   
   CX18 VIDEO4LINUX DRIVER
   M:    Andy Walls <awalls@md.metrocast.net>
   L:    ivtv-devel@ivtvdriver.org (subscribers-only)
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   W:    http://www.ivtvdriver.org/index.php/Cx18
   S:    Maintained
   F:    Documentation/video4linux/cx18.txt
@@@ -3180,7 -3124,7 +3182,7 @@@ CX2341X MPEG ENCODER HELPER MODUL
   M:    Hans Verkuil <hverkuil@xs4all.nl>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   S:    Maintained
   F:    drivers/media/common/cx2341x*
   F:    include/media/cx2341x*
@@@ -3189,7 -3133,7 +3191,7 @@@ CX24120 MEDIA DRIVE
   M:    Jemma Denson <jdenson@gmail.com>
   M:    Patrick Boettcher <patrick.boettcher@posteo.de>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://linuxtv.org
   Q:    http://patchwork.linuxtv.org/project/linux-media/list/
   S:    Maintained
   F:    drivers/media/dvb-frontends/cx24120*
@@@ -3197,7 -3141,7 +3199,7 @@@
   CX88 VIDEO4LINUX DRIVER
   M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   T:    git git://linuxtv.org/media_tree.git
   S:    Odd fixes
   F:    Documentation/video4linux/cx88/
@@@ -3206,7 -3150,7 +3208,7 @@@ F:      drivers/media/pci/cx88
   CXD2820R MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -3312,7 -3256,7 +3314,7 @@@ 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:    https://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
@@@ -3461,21 -3405,8 +3463,21 @@@ DEVICE FREQUENCY (DEVFREQ
   M:    MyungJoo Ham <myungjoo.ham@samsung.com>
   M:    Kyungmin Park <kyungmin.park@samsung.com>
   L:    linux-pm@vger.kernel.org
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git
   S:    Maintained
   F:    drivers/devfreq/
+ +F:    include/linux/devfreq.h
+ +F:    Documentation/devicetree/bindings/devfreq/
+ +
+ +DEVICE FREQUENCY EVENT (DEVFREQ-EVENT)
+ +M:    Chanwoo Choi <cw00.choi@samsung.com>
+ +L:    linux-pm@vger.kernel.org
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git
+ +S:    Supported
+ +F:    drivers/devfreq/event/
+ +F:    drivers/devfreq/devfreq-event.c
+ +F:    include/linux/devfreq-event.h
+ +F:    Documentation/devicetree/bindings/devfreq/event/
   
   DEVICE NUMBER REGISTRY
   M:    Torben Mathiasen <device@lanana.org>
@@@ -3591,7 -3522,7 +3593,7 @@@ M:      Christine Caulfield <ccaulfie@redhat
   M:    David Teigland <teigland@redhat.com>
   L:    cluster-devel@redhat.com
   W:    http://sources.redhat.com/cluster/
- -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git
   S:    Supported
   F:    fs/dlm/
   
@@@ -3665,12 -3596,13 +3667,12 @@@ F:   drivers/scsi/dpt
   F:    drivers/scsi/dpt/
   
   DRBD DRIVER
- -P:    Philipp Reisner
- -P:    Lars Ellenberg
- -M:    drbd-dev@lists.linbit.com
- -L:    drbd-user@lists.linbit.com
+ +M:    Philipp Reisner <philipp.reisner@linbit.com>
+ +M:    Lars Ellenberg <lars.ellenberg@linbit.com>
+ +L:    drbd-dev@lists.linbit.com
   W:    http://www.drbd.org
- -T:    git git://git.drbd.org/linux-2.6-drbd.git drbd
- -T:    git git://git.drbd.org/drbd-8.3.git
+ +T:    git git://git.linbit.com/linux-drbd.git
+ +T:    git git://git.linbit.com/drbd-8.4.git
   S:    Supported
   F:    drivers/block/drbd/
   F:    lib/lru_cache.c
@@@ -3791,7 -3723,7 +3793,7 @@@ F:      Documentation/devicetree/bindings/di
   DRM DRIVERS FOR RENESAS
   M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
   L:    dri-devel@lists.freedesktop.org
- -L:    linux-sh@vger.kernel.org
+ +L:    linux-renesas-soc@vger.kernel.org
   T:    git git://people.freedesktop.org/~airlied/linux
   S:    Supported
   F:    drivers/gpu/drm/rcar-du/
@@@ -3814,15 -3746,6 +3816,15 @@@ S:    Maintaine
   F:    drivers/gpu/drm/sti
   F:    Documentation/devicetree/bindings/display/st,stih4xx.txt
   
+ +DRM DRIVERS FOR VIVANTE GPU IP
+ +M:    Lucas Stach <l.stach@pengutronix.de>
+ +R:    Russell King <linux+etnaviv@arm.linux.org.uk>
+ +R:    Christian Gmeiner <christian.gmeiner@gmail.com>
+ +L:    dri-devel@lists.freedesktop.org
+ +S:    Maintained
+ +F:    drivers/gpu/drm/etnaviv
+ +F:    Documentation/devicetree/bindings/display/etnaviv
+ +
   DSBR100 USB FM RADIO DRIVER
   M:    Alexey Klimov <klimov.linux@gmail.com>
   L:    linux-media@vger.kernel.org
@@@ -3840,14 -3763,14 +3842,14 @@@ DT3155 MEDIA DRIVE
   M:    Hans Verkuil <hverkuil@xs4all.nl>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   S:    Odd Fixes
   F:    drivers/media/pci/dt3155/
   
   DVB_USB_AF9015 MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -3857,7 -3780,7 +3859,7 @@@ F:      drivers/media/usb/dvb-usb-v2/af9015
   DVB_USB_AF9035 MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -3867,7 -3790,7 +3869,7 @@@ F:      drivers/media/usb/dvb-usb-v2/af9035
   DVB_USB_ANYSEE MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -3877,7 -3800,7 +3879,7 @@@ F:      drivers/media/usb/dvb-usb-v2/anysee
   DVB_USB_AU6610 MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -3887,7 -3810,7 +3889,7 @@@ F:      drivers/media/usb/dvb-usb-v2/au6610
   DVB_USB_CE6230 MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -3897,7 -3820,7 +3899,7 @@@ F:      drivers/media/usb/dvb-usb-v2/ce6230
   DVB_USB_CXUSB MEDIA DRIVER
   M:    Michael Krufky <mkrufky@linuxtv.org>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://linuxtv.org
   W:    http://github.com/mkrufky
   Q:    http://patchwork.linuxtv.org/project/linux-media/list/
   T:    git git://linuxtv.org/media_tree.git
@@@ -3907,7 -3830,7 +3909,7 @@@ F:      drivers/media/usb/dvb-usb/cxusb
   DVB_USB_EC168 MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -3917,7 -3840,7 +3919,7 @@@ F:      drivers/media/usb/dvb-usb-v2/ec168
   DVB_USB_GL861 MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://linuxtv.org
   Q:    http://patchwork.linuxtv.org/project/linux-media/list/
   T:    git git://linuxtv.org/anttip/media_tree.git
   S:    Maintained
@@@ -3926,7 -3849,7 +3928,7 @@@ F:      drivers/media/usb/dvb-usb-v2/gl861
   DVB_USB_MXL111SF MEDIA DRIVER
   M:    Michael Krufky <mkrufky@linuxtv.org>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://linuxtv.org
   W:    http://github.com/mkrufky
   Q:    http://patchwork.linuxtv.org/project/linux-media/list/
   T:    git git://linuxtv.org/mkrufky/mxl111sf.git
@@@ -3936,7 -3859,7 +3938,7 @@@ F:      drivers/media/usb/dvb-usb-v2/mxl111s
   DVB_USB_RTL28XXU MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -3946,7 -3869,7 +3948,7 @@@ F:      drivers/media/usb/dvb-usb-v2/rtl28xx
   DVB_USB_V2 MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -3976,7 -3899,7 +3978,7 @@@ F:      Documentation/devicetree/bindings/in
   E4000 MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -3992,7 -3915,7 +3994,7 @@@ F:      drivers/scsi/eata.
   EC100 MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -4004,7 -3927,6 +4006,7 @@@ M:      Tyler Hicks <tyhicks@canonical.com
   L:    ecryptfs@vger.kernel.org
   W:    http://ecryptfs.org
   W:    https://launchpad.net/ecryptfs
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git
   S:    Supported
   F:    Documentation/filesystems/ecryptfs.txt
   F:    fs/ecryptfs/
@@@ -4014,8 -3936,9 +4016,8 @@@ M:      Doug Thompson <dougthompson@xmission
   M:    Borislav Petkov <bp@alien8.de>
   M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
   L:    linux-edac@vger.kernel.org
- -W:    bluesmoke.sourceforge.net
- -T:    git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next
- -T:    git://git.kernel.org/pub/linux/kernel/git/mchehab/linux-edac.git#linux_next
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git for-next
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git linux_next
   S:    Supported
   F:    Documentation/edac.txt
   F:    drivers/edac/
@@@ -4025,6 -3948,7 +4027,6 @@@ EDAC-AMD6
   M:    Doug Thompson <dougthompson@xmission.com>
   M:    Borislav Petkov <bp@alien8.de>
   L:    linux-edac@vger.kernel.org
- -W:    bluesmoke.sourceforge.net
   S:    Maintained
   F:    drivers/edac/amd64_edac*
   
@@@ -4032,6 -3956,7 +4034,6 @@@ EDAC-CALXED
   M:    Doug Thompson <dougthompson@xmission.com>
   M:    Robert Richter <rric@kernel.org>
   L:    linux-edac@vger.kernel.org
- -W:    bluesmoke.sourceforge.net
   S:    Maintained
   F:    drivers/edac/highbank*
   
@@@ -4040,6 -3965,7 +4042,6 @@@ M:      Ralf Baechle <ralf@linux-mips.org
   M:    David Daney <david.daney@cavium.com>
   L:    linux-edac@vger.kernel.org
   L:    linux-mips@linux-mips.org
- -W:    bluesmoke.sourceforge.net
   S:    Supported
   F:    drivers/edac/octeon_edac*
   
@@@ -4047,54 -3973,63 +4049,54 @@@ EDAC-E752
   M:    Mark Gross <mark.gross@intel.com>
   M:    Doug Thompson <dougthompson@xmission.com>
   L:    linux-edac@vger.kernel.org
- -W:    bluesmoke.sourceforge.net
   S:    Maintained
   F:    drivers/edac/e752x_edac.c
   
   EDAC-E7XXX
   M:    Doug Thompson <dougthompson@xmission.com>
   L:    linux-edac@vger.kernel.org
- -W:    bluesmoke.sourceforge.net
   S:    Maintained
   F:    drivers/edac/e7xxx_edac.c
   
   EDAC-GHES
   M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
   L:    linux-edac@vger.kernel.org
- -W:    bluesmoke.sourceforge.net
   S:    Maintained
   F:    drivers/edac/ghes_edac.c
   
   EDAC-I82443BXGX
   M:    Tim Small <tim@buttersideup.com>
   L:    linux-edac@vger.kernel.org
- -W:    bluesmoke.sourceforge.net
   S:    Maintained
   F:    drivers/edac/i82443bxgx_edac.c
   
   EDAC-I3000
   M:    Jason Uhlenkott <juhlenko@akamai.com>
   L:    linux-edac@vger.kernel.org
- -W:    bluesmoke.sourceforge.net
   S:    Maintained
   F:    drivers/edac/i3000_edac.c
   
   EDAC-I5000
   M:    Doug Thompson <dougthompson@xmission.com>
   L:    linux-edac@vger.kernel.org
- -W:    bluesmoke.sourceforge.net
   S:    Maintained
   F:    drivers/edac/i5000_edac.c
   
   EDAC-I5400
   M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
   L:    linux-edac@vger.kernel.org
- -W:    bluesmoke.sourceforge.net
   S:    Maintained
   F:    drivers/edac/i5400_edac.c
   
   EDAC-I7300
   M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
   L:    linux-edac@vger.kernel.org
- -W:    bluesmoke.sourceforge.net
   S:    Maintained
   F:    drivers/edac/i7300_edac.c
   
   EDAC-I7CORE
   M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
   L:    linux-edac@vger.kernel.org
- -W:    bluesmoke.sourceforge.net
   S:    Maintained
   F:    drivers/edac/i7core_edac.c
   
@@@ -4102,36 -4037,42 +4104,36 @@@ EDAC-I82975
   M:    Ranganathan Desikan <ravi@jetztechnologies.com>
   M:    "Arvind R." <arvino55@gmail.com>
   L:    linux-edac@vger.kernel.org
- -W:    bluesmoke.sourceforge.net
   S:    Maintained
   F:    drivers/edac/i82975x_edac.c
   
   EDAC-IE31200
   M:    Jason Baron <jbaron@akamai.com>
   L:    linux-edac@vger.kernel.org
- -W:    bluesmoke.sourceforge.net
   S:    Maintained
   F:    drivers/edac/ie31200_edac.c
   
   EDAC-MPC85XX
   M:    Johannes Thumshirn <morbidrsa@gmail.com>
   L:    linux-edac@vger.kernel.org
- -W:    bluesmoke.sourceforge.net
   S:    Maintained
   F:    drivers/edac/mpc85xx_edac.[ch]
   
   EDAC-PASEMI
   M:    Egor Martovetsky <egor@pasemi.com>
   L:    linux-edac@vger.kernel.org
- -W:    bluesmoke.sourceforge.net
   S:    Maintained
   F:    drivers/edac/pasemi_edac.c
   
   EDAC-R82600
   M:    Tim Small <tim@buttersideup.com>
   L:    linux-edac@vger.kernel.org
- -W:    bluesmoke.sourceforge.net
   S:    Maintained
   F:    drivers/edac/r82600_edac.c
   
   EDAC-SBRIDGE
   M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
   L:    linux-edac@vger.kernel.org
- -W:    bluesmoke.sourceforge.net
   S:    Maintained
   F:    drivers/edac/sb_edac.c
   
@@@ -4198,7 -4139,7 +4200,7 @@@ F:      drivers/net/ethernet/ibm/ehea
   EM28XX VIDEO4LINUX DRIVER
   M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   T:    git git://linuxtv.org/media_tree.git
   S:    Maintained
   F:    drivers/media/usb/em28xx/
@@@ -4283,7 -4224,6 +4285,7 @@@ M:      Andreas Dilger <adilger.kernel@dilge
   L:    linux-ext4@vger.kernel.org
   W:    http://ext4.wiki.kernel.org
   Q:    http://patchwork.ozlabs.org/project/linux-ext4/list/
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git
   S:    Maintained
   F:    Documentation/filesystems/ext4.txt
   F:    fs/ext4/
@@@ -4339,7 -4279,7 +4341,7 @@@ F:      drivers/media/tuners/fc0011.
   FC2580 MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -4553,9 -4493,8 +4555,9 @@@ F:      include/linux/fs_enet_pd.
   FREESCALE QUICC ENGINE LIBRARY
   L:    linuxppc-dev@lists.ozlabs.org
   S:    Orphan
- -F:    arch/powerpc/sysdev/qe_lib/
- -F:    arch/powerpc/include/asm/*qe.h
+ +F:    drivers/soc/fsl/qe/
+ +F:    include/soc/fsl/*qe*.h
+ +F:    include/soc/fsl/*ucc*.h
   
   FREESCALE USB PERIPHERAL DRIVERS
   M:    Li Yang <leoli@freescale.com>
@@@ -4647,7 -4586,8 +4649,7 @@@ F:      include/linux/f2fs_fs.
   F:    include/trace/events/f2fs.h
   
   FUJITSU FR-V (FRV) PORT
- -M:    David Howells <dhowells@redhat.com>
- -S:    Maintained
+ +S:    Orphan
   F:    arch/frv/
   
   FUJITSU LAPTOP EXTRAS
@@@ -4662,7 -4602,7 +4664,7 @@@ M:      Heungjun Kim <riverful.kim@samsung.c
   L:    linux-media@vger.kernel.org
   S:    Maintained
   F:    drivers/media/i2c/m5mols/
- -F:    include/media/m5mols.h
+ +F:    include/media/i2c/m5mols.h
   
   FUJITSU TABLET EXTRAS
   M:    Robert Gerlach <khnz@gmx.de>
@@@ -4708,7 -4648,7 +4710,7 @@@ GEMTEK FM RADIO RECEIVER DRIVE
   M:    Hans Verkuil <hverkuil@xs4all.nl>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   S:    Maintained
   F:    drivers/media/radio/radio-gemtek*
   
@@@ -4916,7 -4856,7 +4918,7 @@@ HDPVR USB VIDEO ENCODER DRIVE
   M:    Hans Verkuil <hverkuil@xs4all.nl>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   S:    Odd Fixes
   F:    drivers/media/usb/hdpvr/
   
@@@ -4935,7 -4875,7 +4937,7 @@@ F:      drivers/tty/hvc
   HACKRF MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -4966,7 -4906,6 +4968,7 @@@ F:      include/linux/hw_random.
   HARDWARE SPINLOCK CORE
   M:    Ohad Ben-Cohen <ohad@wizery.com>
   S:    Maintained
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git
   F:    Documentation/hwspinlock.txt
   F:    drivers/hwspinlock/hwspinlock_*
   F:    include/linux/hwspinlock.h
@@@ -4979,7 -4918,7 +4981,7 @@@ F:      sound/parisc/harmony.
   HD29L2 MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -5048,7 -4987,6 +5050,7 @@@ F:      arch/*/include/asm/suspend*.
   
   HID CORE LAYER
   M:    Jiri Kosina <jikos@kernel.org>
+ +R:    Benjamin Tissoires <benjamin.tissoires@redhat.com>
   L:    linux-input@vger.kernel.org
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
   S:    Maintained
@@@ -5103,20 -5041,13 +5105,20 @@@ F:   include/uapi/linux/if_hippi.
   F:    net/802/hippi.c
   F:    drivers/net/hippi/
   
+ +HISILICON SAS Controller
+ +M:    John Garry <john.garry@huawei.com>
+ +W:    http://www.hisilicon.com
+ +S:    Supported
+ +F:    drivers/scsi/hisi_sas/
+ +F:    Documentation/devicetree/bindings/scsi/hisilicon-sas.txt
+ +
   HOST AP DRIVER
   M:    Jouni Malinen <j@w1.fi>
   L:    hostap@shmoo.com (subscribers-only)
   L:    linux-wireless@vger.kernel.org
   W:    http://hostap.epitest.fi/
   S:    Maintained
- -F:    drivers/net/wireless/hostap/
+ +F:    drivers/net/wireless/intersil/hostap/
   
   HP COMPAQ TC1100 TABLET WMI EXTRAS DRIVER
   L:    platform-driver-x86@vger.kernel.org
@@@ -5354,13 -5285,6 +5356,13 @@@ L:    netdev@vger.kernel.or
   S:    Supported
   F:    drivers/net/ethernet/ibm/ibmveth.*
   
+ +IBM Power SRIOV Virtual NIC Device Driver
+ +M:    Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
+ +M:    John Allen <jallen@linux.vnet.ibm.com>
+ +L:    netdev@vger.kernel.org
+ +S:    Supported
+ +F:    drivers/net/ethernet/ibm/ibmvnic.*
+ +
   IBM Power Virtual SCSI Device Drivers
   M:    Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
   L:    linux-scsi@vger.kernel.org
@@@ -5505,7 -5429,6 +5507,7 @@@ M:      Dmitry Kasatkin <dmitry.kasatkin@gma
   L:    linux-ima-devel@lists.sourceforge.net
   L:    linux-ima-user@lists.sourceforge.net
   L:    linux-security-module@vger.kernel.org
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
   S:    Supported
   F:    security/integrity/ima/
   
@@@ -5581,12 -5504,6 +5583,12 @@@ T:    git git://git.code.sf.net/p/intel-sa
   S:    Supported
   F:    drivers/scsi/isci/
   
+ +INTEL HID EVENT DRIVER
+ +M:    Alex Hung <alex.hung@canonical.com>
+ +L:    platform-driver-x86@vger.kernel.org
+ +S:    Maintained
+ +F:    drivers/platform/x86/intel-hid.c
+ +
   INTEL IDLE DRIVER
   M:    Len Brown <lenb@kernel.org>
   L:    linux-pm@vger.kernel.org
@@@ -5698,7 -5615,7 +5700,7 @@@ L:      linux-wireless@vger.kernel.or
   S:    Maintained
   F:    Documentation/networking/README.ipw2100
   F:    Documentation/networking/README.ipw2200
- -F:    drivers/net/wireless/ipw2x00/
+ +F:    drivers/net/wireless/intel/ipw2x00/
   
   INTEL(R) TRACE HUB
   M:    Alexander Shishkin <alexander.shishkin@linux.intel.com>
@@@ -5707,7 -5624,9 +5709,7 @@@ F:      Documentation/trace/intel_th.tx
   F:    drivers/hwtracing/intel_th/
   
   INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)
- -M:    Richard L Maliszewski <richard.l.maliszewski@intel.com>
- -M:    Gang Wei <gang.wei@intel.com>
- -M:    Shane Wang <shane.wang@intel.com>
+ +M:    Ning Sun <ning.sun@intel.com>
   L:    tboot-devel@lists.sourceforge.net
   W:    http://tboot.sourceforge.net
   T:    hg http://tboot.hg.sourceforge.net:8000/hgroot/tboot/tboot
@@@ -5730,7 -5649,7 +5732,7 @@@ INTEL WIRELESS 3945ABG/BG, 4965AGN (iwl
   M:    Stanislaw Gruszka <sgruszka@redhat.com>
   L:    linux-wireless@vger.kernel.org
   S:    Supported
- -F:    drivers/net/wireless/iwlegacy/
+ +F:    drivers/net/wireless/intel/iwlegacy/
   
   INTEL WIRELESS WIFI LINK (iwlwifi)
   M:    Johannes Berg <johannes.berg@intel.com>
@@@ -5740,7 -5659,7 +5742,7 @@@ L:      linux-wireless@vger.kernel.or
   W:    http://intellinuxwireless.org
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git
   S:    Supported
- -F:    drivers/net/wireless/iwlwifi/
+ +F:    drivers/net/wireless/intel/iwlwifi/
   
   INTEL MANAGEMENT ENGINE (mei)
   M:    Tomas Winkler <tomas.winkler@intel.com>
@@@ -5761,27 -5680,18 +5763,27 @@@ F:   include/linux/mic_bus.
   F:    include/linux/scif.h
   F:    include/uapi/linux/mic_common.h
   F:    include/uapi/linux/mic_ioctl.h
- -F     include/uapi/linux/scif_ioctl.h
+ +F:    include/uapi/linux/scif_ioctl.h
   F:    drivers/misc/mic/
   F:    drivers/dma/mic_x100_dma.c
   F:    drivers/dma/mic_x100_dma.h
- -F     Documentation/mic/
+ +F:    Documentation/mic/
   
- -INTEL PMC IPC DRIVER
+ +INTEL PMC/P-Unit IPC DRIVER
   M:    Zha Qipeng<qipeng.zha@intel.com>
   L:    platform-driver-x86@vger.kernel.org
   S:    Maintained
   F:    drivers/platform/x86/intel_pmc_ipc.c
+ +F:    drivers/platform/x86/intel_punit_ipc.c
   F:    arch/x86/include/asm/intel_pmc_ipc.h
+ +F:    arch/x86/include/asm/intel_punit_ipc.h
+ +
+ +INTEL TELEMETRY DRIVER
+ +M:    Souvik Kumar Chakravarty <souvik.k.chakravarty@intel.com>
+ +L:    platform-driver-x86@vger.kernel.org
+ +S:    Maintained
+ +F:    arch/x86/include/asm/intel_telemetry.h
+ +F:    drivers/platform/x86/intel_telemetry*
   
   IOC3 ETHERNET DRIVER
   M:    Ralf Baechle <ralf@linux-mips.org>
@@@ -5844,8 -5754,6 +5846,8 @@@ M:      Julian Anastasov <ja@ssi.bg
   L:    netdev@vger.kernel.org
   L:    lvs-devel@vger.kernel.org
   S:    Maintained
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git
   F:    Documentation/networking/ipvs-sysctl.txt
   F:    include/net/ip_vs.h
   F:    include/uapi/linux/ip_vs.h
@@@ -5916,7 -5824,7 +5918,7 @@@ ISA RADIO MODUL
   M:    Hans Verkuil <hverkuil@xs4all.nl>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   S:    Maintained
   F:    drivers/media/radio/radio-isa*
   
@@@ -5986,7 -5894,7 +5988,7 @@@ F:      drivers/hwmon/it87.
   IT913X MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -6007,7 -5915,7 +6009,7 @@@ F:      include/uapi/linux/ivtv
   IX2505V MEDIA DRIVER
   M:    Malcolm Priestley <tvboxspy@gmail.com>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://linuxtv.org
   Q:    http://patchwork.linuxtv.org/project/linux-media/list/
   S:    Maintained
   F:    drivers/media/dvb-frontends/ix2505v*
@@@ -6096,7 -6004,7 +6098,7 @@@ KEENE FM RADIO TRANSMITTER DRIVE
   M:    Hans Verkuil <hverkuil@xs4all.nl>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   S:    Maintained
   F:    drivers/media/radio/radio-keene*
   
@@@ -6129,7 -6037,6 +6131,7 @@@ M:      "J. Bruce Fields" <bfields@fieldses.
   M:    Jeff Layton <jlayton@poochiereds.net>
   L:    linux-nfs@vger.kernel.org
   W:    http://nfs.sourceforge.net/
+ +T:    git git://linux-nfs.org/~bfields/linux.git
   S:    Supported
   F:    fs/nfsd/
   F:    include/uapi/linux/nfsd/
@@@ -6186,7 -6093,6 +6188,7 @@@ M:      Christian Borntraeger <borntraeger@d
   M:    Cornelia Huck <cornelia.huck@de.ibm.com>
   L:    linux-s390@vger.kernel.org
   W:    http://www.ibm.com/developerworks/linux/linux390/
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
   S:    Supported
   F:    Documentation/s390/kvm.txt
   F:    arch/s390/include/asm/kvm*
@@@ -6198,7 -6104,6 +6200,7 @@@ M:      Marc Zyngier <marc.zyngier@arm.com
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   L:    kvmarm@lists.cs.columbia.edu
   W:    http://systems.cs.columbia.edu/projects/kvm-arm
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
   S:    Supported
   F:    arch/arm/include/uapi/asm/kvm*
   F:    arch/arm/include/asm/kvm*
@@@ -6216,6 -6121,14 +6218,14 @@@ F:    arch/arm64/include/uapi/asm/kvm
   F:    arch/arm64/include/asm/kvm*
   F:    arch/arm64/kvm/
   
+ KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)
+ M:    James Hogan <james.hogan@imgtec.com>
+ L:    linux-mips@linux-mips.org
+ S:    Supported
+ F:    arch/mips/include/uapi/asm/kvm*
+ F:    arch/mips/include/asm/kvm*
+ F:    arch/mips/kvm/
+ 
   KEXEC
   M:    Eric Biederman <ebiederm@xmission.com>
   W:    http://kernel.org/pub/linux/utils/kernel/kexec/
@@@ -6260,7 -6173,6 +6270,7 @@@ KGDB / KDB /debug_cor
   M:    Jason Wessel <jason.wessel@windriver.com>
   W:    http://kgdb.wiki.kernel.org/
   L:    kgdb-bugreport@lists.sourceforge.net
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git
   S:    Maintained
   F:    Documentation/DocBook/kgdb.tmpl
   F:    drivers/misc/kgdbts.c
@@@ -6313,6 -6225,12 +6323,12 @@@ S:    Maintaine
   F:    net/l3mdev
   F:    include/net/l3mdev.h
   
+ LANTIQ MIPS ARCHITECTURE
+ M:    John Crispin <blogic@openwrt.org>
+ L:    linux-mips@linux-mips.org
+ S:    Maintained
+ F:    arch/mips/lantiq
+ 
   LAPB module
   L:    linux-x25@vger.kernel.org
   S:    Orphan
@@@ -6352,7 -6270,7 +6368,7 @@@ F:      drivers/usb/misc/legousbtower.
   LG2160 MEDIA DRIVER
   M:    Michael Krufky <mkrufky@linuxtv.org>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://linuxtv.org
   W:    http://github.com/mkrufky
   Q:    http://patchwork.linuxtv.org/project/linux-media/list/
   T:    git git://linuxtv.org/mkrufky/tuners.git
@@@ -6362,7 -6280,7 +6378,7 @@@ F:      drivers/media/dvb-frontends/lg2160.
   LGDT3305 MEDIA DRIVER
   M:    Michael Krufky <mkrufky@linuxtv.org>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://linuxtv.org
   W:    http://github.com/mkrufky
   Q:    http://patchwork.linuxtv.org/project/linux-media/list/
   T:    git git://linuxtv.org/mkrufky/tuners.git
@@@ -6432,7 -6350,6 +6448,7 @@@ LIBNVDIMM: NON-VOLATILE MEMORY DEVICE S
   M:    Dan Williams <dan.j.williams@intel.com>
   L:    linux-nvdimm@lists.01.org
   Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git
   S:    Supported
   F:    drivers/nvdimm/*
   F:    include/linux/nd.h
@@@ -6530,7 -6447,7 +6546,7 @@@ S:      Maintaine
   F:    arch/powerpc/platforms/8xx/
   
   LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX
- -M:    Scott Wood <scottwood@freescale.com>
+ +M:    Scott Wood <oss@buserror.net>
   M:    Kumar Gala <galak@kernel.crashing.org>
   W:    http://www.penguinppc.org/
   L:    linuxppc-dev@lists.ozlabs.org
@@@ -6620,7 -6537,7 +6636,7 @@@ F:      drivers/hwmon/lm95234.
   LME2510 MEDIA DRIVER
   M:    Malcolm Priestley <tvboxspy@gmail.com>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://linuxtv.org
   Q:    http://patchwork.linuxtv.org/project/linux-media/list/
   S:    Maintained
   F:    drivers/media/usb/dvb-usb-v2/lmedm04*
@@@ -6726,7 -6643,7 +6742,7 @@@ F:      arch/m68k/hp300
   M88DS3103 MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -6736,7 -6653,7 +6752,7 @@@ F:      drivers/media/dvb-frontends/m88ds310
   M88RS2000 MEDIA DRIVER
   M:    Malcolm Priestley <tvboxspy@gmail.com>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://linuxtv.org
   Q:    http://patchwork.linuxtv.org/project/linux-media/list/
   S:    Maintained
   F:    drivers/media/dvb-frontends/m88rs2000*
@@@ -6807,7 -6724,7 +6823,7 @@@ F:      drivers/net/ethernet/marvell/sk
   MARVELL LIBERTAS WIRELESS DRIVER
   L:    libertas-dev@lists.infradead.org
   S:    Orphan
- -F:    drivers/net/wireless/libertas/
+ +F:    drivers/net/wireless/marvell/libertas/
   
   MARVELL MV643XX ETHERNET DRIVER
   M:    Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
@@@ -6827,13 -6744,13 +6843,13 @@@ M:   Amitkumar Karwar <akarwar@marvell.co
   M:    Nishant Sarmukadam <nishants@marvell.com>
   L:    linux-wireless@vger.kernel.org
   S:    Maintained
- -F:    drivers/net/wireless/mwifiex/
+ +F:    drivers/net/wireless/marvell/mwifiex/
   
   MARVELL MWL8K WIRELESS DRIVER
   M:    Lennert Buytenhek <buytenh@wantstofly.org>
   L:    linux-wireless@vger.kernel.org
   S:    Odd Fixes
- -F:    drivers/net/wireless/mwl8k.c
+ +F:    drivers/net/wireless/marvell/mwl8k.c
   
   MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
   M:    Nicolas Pitre <nico@fluxnic.net>
@@@ -6915,7 -6832,7 +6931,7 @@@ MAXIRADIO FM RADIO RECEIVER DRIVE
   M:    Hans Verkuil <hverkuil@xs4all.nl>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   S:    Maintained
   F:    drivers/media/radio/radio-maxiradio*
   
@@@ -6928,7 -6845,7 +6944,7 @@@ F:      drivers/iio/potentiometer/mcp4531.
   MEDIA DRIVERS FOR RENESAS - VSP1
   M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
   L:    linux-media@vger.kernel.org
- -L:    linux-sh@vger.kernel.org
+ +L:    linux-renesas-soc@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
   S:    Supported
   F:    Documentation/devicetree/bindings/media/renesas,vsp1.txt
@@@ -6937,7 -6854,7 +6953,7 @@@ F:      drivers/media/platform/vsp1
   MEDIA DRIVERS FOR ASCOT2E
   M:    Sergey Kozlov <serjk@netup.ru>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   W:    http://netup.tv/
   T:    git git://linuxtv.org/media_tree.git
   S:    Supported
@@@ -6946,7 -6863,7 +6962,7 @@@ F:      drivers/media/dvb-frontends/ascot2e
   MEDIA DRIVERS FOR CXD2841ER
   M:    Sergey Kozlov <serjk@netup.ru>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://linuxtv.org
   W:    http://netup.tv/
   T:    git git://linuxtv.org/media_tree.git
   S:    Supported
@@@ -6955,7 -6872,7 +6971,7 @@@ F:      drivers/media/dvb-frontends/cxd2841e
   MEDIA DRIVERS FOR HORUS3A
   M:    Sergey Kozlov <serjk@netup.ru>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://linuxtv.org
   W:    http://netup.tv/
   T:    git git://linuxtv.org/media_tree.git
   S:    Supported
@@@ -6964,7 -6881,7 +6980,7 @@@ F:      drivers/media/dvb-frontends/horus3a
   MEDIA DRIVERS FOR LNBH25
   M:    Sergey Kozlov <serjk@netup.ru>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://linuxtv.org
   W:    http://netup.tv/
   T:    git git://linuxtv.org/media_tree.git
   S:    Supported
@@@ -6973,7 -6890,7 +6989,7 @@@ F:      drivers/media/dvb-frontends/lnbh25
   MEDIA DRIVERS FOR NETUP PCI UNIVERSAL DVB devices
   M:    Sergey Kozlov <serjk@netup.ru>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://linuxtv.org
   W:    http://netup.tv/
   T:    git git://linuxtv.org/media_tree.git
   S:    Supported
@@@ -6983,7 -6900,7 +6999,7 @@@ MEDIA INPUT INFRASTRUCTURE (V4L/DVB
   M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
   P:    LinuxTV.org Project
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   Q:    http://patchwork.kernel.org/project/linux-media/list/
   T:    git git://linuxtv.org/media_tree.git
   S:    Maintained
@@@ -6992,7 -6909,6 +7008,7 @@@ F:      Documentation/video4linux
   F:    Documentation/DocBook/media/
   F:    drivers/media/
   F:    drivers/staging/media/
+ +F:    include/linux/platform_data/media/
   F:    include/media/
   F:    include/uapi/linux/dvb/
   F:    include/uapi/linux/videodev2.h
@@@ -7102,7 -7018,6 +7118,7 @@@ F:      Documentation/hwmon/menf21bm
   METAG ARCHITECTURE
   M:    James Hogan <james.hogan@imgtec.com>
   L:    linux-metag@vger.kernel.org
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git
   S:    Odd Fixes
   F:    arch/metag/
   F:    Documentation/metag/
@@@ -7145,49 -7060,31 +7161,49 @@@ MIROSOUND PCM20 FM RADIO RECEIVER DRIVE
   M:    Hans Verkuil <hverkuil@xs4all.nl>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   S:    Odd Fixes
   F:    drivers/media/radio/radio-miropcm20*
   
- -Mellanox MLX5 core VPI driver
- -M:    Eli Cohen <eli@mellanox.com>
+ +MELLANOX MLX4 core VPI driver
+ +M:    Yishai Hadas <yishaih@mellanox.com>
   L:    netdev@vger.kernel.org
   L:    linux-rdma@vger.kernel.org
   W:    http://www.mellanox.com
   Q:    http://patchwork.ozlabs.org/project/netdev/list/
+ +S:    Supported
+ +F:    drivers/net/ethernet/mellanox/mlx4/
+ +F:    include/linux/mlx4/
+ +
+ +MELLANOX MLX4 IB driver
+ +M:    Yishai Hadas <yishaih@mellanox.com>
+ +L:    linux-rdma@vger.kernel.org
+ +W:    http://www.mellanox.com
   Q:    http://patchwork.kernel.org/project/linux-rdma/list/
- -T:    git git://openfabrics.org/~eli/connect-ib.git
+ +S:    Supported
+ +F:    drivers/infiniband/hw/mlx4/
+ +F:    include/linux/mlx4/
+ +
+ +MELLANOX MLX5 core VPI driver
+ +M:    Matan Barak <matanb@mellanox.com>
+ +M:    Leon Romanovsky <leonro@mellanox.com>
+ +L:    netdev@vger.kernel.org
+ +L:    linux-rdma@vger.kernel.org
+ +W:    http://www.mellanox.com
+ +Q:    http://patchwork.ozlabs.org/project/netdev/list/
   S:    Supported
   F:    drivers/net/ethernet/mellanox/mlx5/core/
   F:    include/linux/mlx5/
   
- -Mellanox MLX5 IB driver
- -M:    Eli Cohen <eli@mellanox.com>
+ +MELLANOX MLX5 IB driver
+ +M:    Matan Barak <matanb@mellanox.com>
+ +M:    Leon Romanovsky <leonro@mellanox.com>
   L:    linux-rdma@vger.kernel.org
   W:    http://www.mellanox.com
   Q:    http://patchwork.kernel.org/project/linux-rdma/list/
- -T:    git git://openfabrics.org/~eli/connect-ib.git
   S:    Supported
- -F:    include/linux/mlx5/
   F:    drivers/infiniband/hw/mlx5/
+ +F:    include/linux/mlx5/
   
   MELEXIS MLX90614 DRIVER
   M:    Crt Mori <cmo@melexis.com>
@@@ -7199,7 -7096,7 +7215,7 @@@ F:      drivers/iio/temperature/mlx90614.
   MN88472 MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -7210,7 -7107,7 +7226,7 @@@ F:      drivers/media/dvb-frontends/mn88472.
   MN88473 MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -7265,7 -7162,7 +7281,7 @@@ F:      drivers/platform/x86/msi-wmi.
   MSI001 MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -7275,7 -7172,7 +7291,7 @@@ F:      drivers/media/tuners/msi001
   MSI2500 MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -7294,7 -7191,7 +7310,7 @@@ L:      linux-media@vger.kernel.or
   T:    git git://linuxtv.org/media_tree.git
   S:    Maintained
   F:    drivers/media/i2c/mt9m032.c
- -F:    include/media/mt9m032.h
+ +F:    include/media/i2c/mt9m032.h
   
   MT9P031 APTINA CAMERA SENSOR
   M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@@ -7302,7 -7199,7 +7318,7 @@@ L:      linux-media@vger.kernel.or
   T:    git git://linuxtv.org/media_tree.git
   S:    Maintained
   F:    drivers/media/i2c/mt9p031.c
- -F:    include/media/mt9p031.h
+ +F:    include/media/i2c/mt9p031.h
   
   MT9T001 APTINA CAMERA SENSOR
   M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@@ -7310,7 -7207,7 +7326,7 @@@ L:      linux-media@vger.kernel.or
   T:    git git://linuxtv.org/media_tree.git
   S:    Maintained
   F:    drivers/media/i2c/mt9t001.c
- -F:    include/media/mt9t001.h
+ +F:    include/media/i2c/mt9t001.h
   
   MT9V032 APTINA CAMERA SENSOR
   M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@@ -7319,7 -7216,7 +7335,7 @@@ T:      git git://linuxtv.org/media_tree.gi
   S:    Maintained
   F:    Documentation/devicetree/bindings/media/i2c/mt9v032.txt
   F:    drivers/media/i2c/mt9v032.c
- -F:    include/media/mt9v032.h
+ +F:    include/media/i2c/mt9v032.h
   
   MULTIFUNCTION DEVICES (MFD)
   M:    Lee Jones <lee.jones@linaro.org>
@@@ -7363,7 -7260,7 +7379,7 @@@ F:      drivers/usb/musb
   MXL5007T MEDIA DRIVER
   M:    Michael Krufky <mkrufky@linuxtv.org>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://linuxtv.org
   W:    http://github.com/mkrufky
   Q:    http://patchwork.linuxtv.org/project/linux-media/list/
   T:    git git://linuxtv.org/mkrufky/tuners.git
@@@ -7488,13 -7385,6 +7504,13 @@@ F:    include/net/netrom.
   F:    include/uapi/linux/netrom.h
   F:    net/netrom/
   
+ +NETRONOME ETHERNET DRIVERS
+ +M:    Jakub Kicinski <jakub.kicinski@netronome.com>
+ +M:    Rolf Neugebauer <rolf.neugebauer@netronome.com>
+ +L:    oss-drivers@netronome.com
+ +S:    Maintained
+ +F:    drivers/net/ethernet/netronome/
+ +
   NETWORK BLOCK DEVICE (NBD)
   M:    Markus Pargmann <mpa@pengutronix.de>
   S:    Maintained
@@@ -7602,8 -7492,7 +7618,8 @@@ NETWORKING DRIVERS (WIRELESS
   M:    Kalle Valo <kvalo@codeaurora.org>
   L:    linux-wireless@vger.kernel.org
   Q:    http://patchwork.kernel.org/project/linux-wireless/list/
- -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git/
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git
   S:    Maintained
   F:    drivers/net/wireless/
   
@@@ -7627,12 -7516,7 +7643,12 @@@ F:    net/nfc
   F:    include/net/nfc/
   F:    include/uapi/linux/nfc.h
   F:    drivers/nfc/
+ +F:    include/linux/platform_data/microread.h
+ +F:    include/linux/platform_data/nfcmrvl.h
+ +F:    include/linux/platform_data/nxp-nci.h
   F:    include/linux/platform_data/pn544.h
+ +F:    include/linux/platform_data/st21nfca.h
+ +F:    include/linux/platform_data/st-nci.h
   F:    Documentation/devicetree/bindings/net/nfc/
   
   NFS, SUNRPC, AND LOCKD CLIENTS
@@@ -7718,12 -7602,6 +7734,12 @@@ W:    https://github.com/jonmason/ntb/wik
   T:    git git://github.com/jonmason/ntb.git
   F:    drivers/ntb/hw/intel/
   
+ +NTB AMD DRIVER
+ +M:    Xiangliang Yu <Xiangliang.Yu@amd.com>
+ +L:    linux-ntb@googlegroups.com
+ +S:    Supported
+ +F:    drivers/ntb/hw/amd/
+ +
   NTFS FILESYSTEM
   M:    Anton Altaparmakov <anton@tuxera.com>
   L:    linux-ntfs-dev@lists.sourceforge.net
@@@ -7932,12 -7810,11 +7948,12 @@@ F:   drivers/usb/*/*omap
   F:    arch/arm/*omap*/usb*
   
   OMAP GPIO DRIVER
- -M:    Javier Martinez Canillas <javier@dowhile0.org>
+ +M:    Grygorii Strashko <grygorii.strashko@ti.com>
   M:    Santosh Shilimkar <ssantosh@kernel.org>
   M:    Kevin Hilman <khilman@deeprootsystems.com>
   L:    linux-omap@vger.kernel.org
   S:    Maintained
+ +F:    Documentation/devicetree/bindings/gpio/gpio-omap.txt
   F:    drivers/gpio/gpio-omap.c
   
   OMAP/NEWFLOW NANOBONE MACHINE SUPPORT
@@@ -8015,7 -7892,6 +8031,7 @@@ M:      Mark Rutland <mark.rutland@arm.com
   M:    Ian Campbell <ijc+devicetree@hellion.org.uk>
   M:    Kumar Gala <galak@codeaurora.org>
   L:    devicetree@vger.kernel.org
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
   S:    Maintained
   F:    Documentation/devicetree/
   F:    arch/*/boot/dts/
@@@ -8090,7 -7966,7 +8106,7 @@@ L:      linux-wireless@vger.kernel.or
   W:    http://wireless.kernel.org/en/users/Drivers/orinoco
   W:    http://www.nongnu.org/orinoco/
   S:    Orphan
- -F:    drivers/net/wireless/orinoco/
+ +F:    drivers/net/wireless/intersil/orinoco/
   
   OSD LIBRARY and FILESYSTEM
   M:    Boaz Harrosh <ooo@electrozaur.com>
@@@ -8116,7 -7992,7 +8132,7 @@@ M:      Christian Lamparter <chunkeey@google
   L:    linux-wireless@vger.kernel.org
   W:    http://wireless.kernel.org/en/users/Drivers/p54
   S:    Maintained
- -F:    drivers/net/wireless/p54/
+ +F:    drivers/net/wireless/intersil/p54/
   
   PA SEMI ETHERNET DRIVER
   M:    Olof Johansson <olof@lixom.net>
@@@ -8332,7 -8208,7 +8348,7 @@@ F:      drivers/pci/host/pci-dra7xx.
   PCI DRIVER FOR RENESAS R-CAR
   M:    Simon Horman <horms@verge.net.au>
   L:    linux-pci@vger.kernel.org
- -L:    linux-sh@vger.kernel.org
+ +L:    linux-renesas-soc@vger.kernel.org
   S:    Maintained
   F:    drivers/pci/host/*rcar*
   
@@@ -8359,12 -8235,6 +8375,12 @@@ S:    Maintaine
   F:    Documentation/devicetree/bindings/pci/host-generic-pci.txt
   F:    drivers/pci/host/pci-host-generic.c
   
+ +PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (VMD)
+ +M:    Keith Busch <keith.busch@intel.com>
+ +L:    linux-pci@vger.kernel.org
+ +S:    Supported
+ +F:    arch/x86/pci/vmd.c
+ +
   PCIE DRIVER FOR ST SPEAR13XX
   M:    Pratyush Anand <pratyush.anand@gmail.com>
   L:    linux-pci@vger.kernel.org
@@@ -8389,24 -8259,16 +8405,24 @@@ F:   drivers/pci/host/pci-xgene-msi.
   
   PCIE DRIVER FOR HISILICON
   M:    Zhou Wang <wangzhou1@hisilicon.com>
+ +M:    Gabriele Paoloni <gabriele.paoloni@huawei.com>
   L:    linux-pci@vger.kernel.org
   S:    Maintained
   F:    Documentation/devicetree/bindings/pci/hisilicon-pcie.txt
   F:    drivers/pci/host/pcie-hisi.c
   
+ +PCIE DRIVER FOR QUALCOMM MSM
+ +M:     Stanimir Varbanov <svarbanov@mm-sol.com>
+ +L:     linux-pci@vger.kernel.org
+ +L:     linux-arm-msm@vger.kernel.org
+ +S:     Maintained
+ +F:     drivers/pci/host/*qcom*
+ +
   PCMCIA SUBSYSTEM
   P:    Linux PCMCIA Team
   L:    linux-pcmcia@lists.infradead.org
   W:    http://lists.infradead.org/mailman/listinfo/linux-pcmcia
- -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git
   S:    Maintained
   F:    Documentation/pcmcia/
   F:    drivers/pcmcia/
@@@ -8523,8 -8385,7 +8539,8 @@@ F:      drivers/pinctrl/intel
   
   PIN CONTROLLER - RENESAS
   M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
- -L:    linux-sh@vger.kernel.org
+ +M:    Geert Uytterhoeven <geert+renesas@glider.be>
+ +L:    linux-renesas-soc@vger.kernel.org
   S:    Maintained
   F:    drivers/pinctrl/sh-pfc/
   
@@@ -8602,17 -8463,6 +8618,17 @@@ F:    fs/timerfd.
   F:    include/linux/timer*
   F:    kernel/time/*timer*
   
+ +POWER MANAGEMENT CORE
+ +M:    "Rafael J. Wysocki" <rjw@rjwysocki.net>
+ +L:    linux-pm@vger.kernel.org
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
+ +S:    Supported
+ +F:    drivers/base/power/
+ +F:    include/linux/pm.h
+ +F:    include/linux/pm_*
+ +F:    include/linux/powercap.h
+ +F:    drivers/powercap/
+ +
   POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
   M:    Sebastian Reichel <sre@kernel.org>
   M:    Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
@@@ -8692,7 -8542,7 +8708,7 @@@ M:      "Luis R. Rodriguez" <mcgrof@gmail.co
   L:    linux-wireless@vger.kernel.org
   W:    http://wireless.kernel.org/en/users/Drivers/p54
   S:    Obsolete
- -F:    drivers/net/wireless/prism54/
+ +F:    drivers/net/wireless/intersil/prism54/
   
   PS3 NETWORK SUPPORT
   M:    Geoff Levand <geoff@infradead.org>
@@@ -8728,7 -8578,7 +8744,7 @@@ M:      Colin Cross <ccross@android.com
   M:    Kees Cook <keescook@chromium.org>
   M:    Tony Luck <tony.luck@intel.com>
   S:    Maintained
- -T:    git git://git.infradead.org/users/cbou/linux-pstore.git
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
   F:    fs/pstore/
   F:    include/linux/pstore*
   F:    drivers/firmware/efi/efi-pstore.c
@@@ -8805,19 -8655,12 +8821,19 @@@ S:   Maintaine
   F:    arch/arm/mach-pxa/
   F:    drivers/dma/pxa*
   F:    drivers/pcmcia/pxa2xx*
+ +F:    drivers/pinctrl/pxa/
   F:    drivers/spi/spi-pxa2xx*
   F:    drivers/usb/gadget/udc/pxa2*
   F:    include/sound/pxa2xx-lib.h
   F:    sound/arm/pxa*
   F:    sound/soc/pxa/
   
+ +PXA GPIO DRIVER
+ +M:    Robert Jarzmik <robert.jarzmik@free.fr>
+ +L:    linux-gpio@vger.kernel.org
+ +S:    Maintained
+ +F:    drivers/gpio/gpio-pxa.c
+ +
   PXA3xx NAND FLASH DRIVER
   M:    Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
   L:    linux-mtd@lists.infradead.org
@@@ -8918,7 -8761,7 +8934,7 @@@ F:      include/uapi/linux/qnxtypes.
   QT1010 MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -8937,14 -8780,13 +8953,14 @@@ QUALCOMM ATHEROS ATH10K WIRELESS DRIVE
   M:    Kalle Valo <kvalo@qca.qualcomm.com>
   L:    ath10k@lists.infradead.org
   W:    http://wireless.kernel.org/en/users/Drivers/ath10k
- -T:    git git://github.com/kvalo/ath.git
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
   S:    Supported
   F:    drivers/net/wireless/ath/ath10k/
   
   QUALCOMM HEXAGON ARCHITECTURE
   M:    Richard Kuo <rkuo@codeaurora.org>
   L:    linux-hexagon@vger.kernel.org
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git
   S:    Supported
   F:    arch/hexagon/
   
@@@ -8997,13 -8839,19 +9013,19 @@@ L:   linux-fbdev@vger.kernel.or
   S:    Maintained
   F:    drivers/video/fbdev/aty/aty128fb.c
   
+ RALINK MIPS ARCHITECTURE
+ M:    John Crispin <blogic@openwrt.org>
+ L:    linux-mips@linux-mips.org
+ S:    Maintained
+ F:    arch/mips/ralink
+ 
   RALINK RT2X00 WIRELESS LAN DRIVER
   P:    rt2x00 project
   M:    Stanislaw Gruszka <sgruszka@redhat.com>
   M:    Helmut Schaa <helmut.schaa@googlemail.com>
   L:    linux-wireless@vger.kernel.org
   S:    Maintained
- -F:    drivers/net/wireless/rt2x00/
+ +F:    drivers/net/wireless/ralink/rt2x00/
   
   RAMDISK RAM BLOCK DEVICE DRIVER
   M:    Jens Axboe <axboe@kernel.dk>
@@@ -9131,19 -8979,12 +9153,19 @@@ F:   include/linux/rpmsg.
   RENESAS ETHERNET DRIVERS
   R:    Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
   L:    netdev@vger.kernel.org
- -L:    linux-sh@vger.kernel.org
+ +L:    linux-renesas-soc@vger.kernel.org
   F:    drivers/net/ethernet/renesas/
   F:    include/linux/sh_eth.h
   
+ +RENESAS USB2 PHY DRIVER
+ +M:    Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
+ +L:    linux-renesas-soc@vger.kernel.org
+ +S:    Maintained
+ +F:    drivers/phy/phy-rcar-gen3-usb2.c
+ +
   RESET CONTROLLER FRAMEWORK
   M:    Philipp Zabel <p.zabel@pengutronix.de>
+ +T:    git git://git.pengutronix.de/git/pza/linux
   S:    Maintained
   F:    drivers/reset/
   F:    Documentation/devicetree/bindings/reset/
@@@ -9219,7 -9060,7 +9241,7 @@@ F:      net/rose
   RTL2830 MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -9229,7 -9070,7 +9251,7 @@@ 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:    https://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
@@@ -9239,7 -9080,7 +9261,7 @@@ F:      drivers/media/dvb-frontends/rtl2832
   RTL2832_SDR MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -9251,7 -9092,7 +9273,7 @@@ L:      linux-wireless@vger.kernel.or
   W:    http://wireless.kernel.org/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
   S:    Orphan
- -F:    drivers/net/wireless/rtl818x/rtl8180/
+ +F:    drivers/net/wireless/realtek/rtl818x/rtl8180/
   
   RTL8187 WIRELESS DRIVER
   M:    Herton Ronaldo Krzesinski <herton@canonical.com>
@@@ -9261,7 -9102,7 +9283,7 @@@ L:      linux-wireless@vger.kernel.or
   W:    http://wireless.kernel.org/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
   S:    Maintained
- -F:    drivers/net/wireless/rtl818x/rtl8187/
+ +F:    drivers/net/wireless/realtek/rtl818x/rtl8187/
   
   RTL8192CE WIRELESS DRIVER
   M:    Larry Finger <Larry.Finger@lwfinger.net>
@@@ -9270,8 -9111,8 +9292,8 @@@ L:      linux-wireless@vger.kernel.or
   W:    http://wireless.kernel.org/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
   S:    Maintained
- -F:    drivers/net/wireless/rtlwifi/
- -F:    drivers/net/wireless/rtlwifi/rtl8192ce/
+ +F:    drivers/net/wireless/realtek/rtlwifi/
+ +F:    drivers/net/wireless/realtek/rtlwifi/rtl8192ce/
   
   RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
   M:    Jes Sorensen <Jes.Sorensen@redhat.com>
@@@ -9291,7 -9132,6 +9313,7 @@@ M:      Martin Schwidefsky <schwidefsky@de.i
   M:    Heiko Carstens <heiko.carstens@de.ibm.com>
   L:    linux-s390@vger.kernel.org
   W:    http://www.ibm.com/developerworks/linux/linux390/
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git
   S:    Supported
   F:    arch/s390/
   F:    drivers/s390/
@@@ -9316,7 -9156,7 +9338,7 @@@ F:      drivers/s390/block/dasd
   F:    block/partitions/ibm.c
   
   S390 NETWORK DRIVERS
- -M:    Ursula Braun <ursula.braun@de.ibm.com>
+ +M:    Ursula Braun <ubraun@linux.vnet.ibm.com>
   L:    linux-s390@vger.kernel.org
   W:    http://www.ibm.com/developerworks/linux/linux390/
   S:    Supported
@@@ -9346,7 -9186,7 +9368,7 @@@ S:      Supporte
   F:    drivers/s390/scsi/zfcp_*
   
   S390 IUCV NETWORK LAYER
- -M:    Ursula Braun <ursula.braun@de.ibm.com>
+ +M:    Ursula Braun <ubraun@linux.vnet.ibm.com>
   L:    linux-s390@vger.kernel.org
   W:    http://www.ibm.com/developerworks/linux/linux390/
   S:    Supported
@@@ -9371,14 -9211,14 +9393,14 @@@ SAA6588 RDS RECEIVER DRIVE
   M:    Hans Verkuil <hverkuil@xs4all.nl>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   S:    Odd Fixes
   F:    drivers/media/i2c/saa6588*
   
   SAA7134 VIDEO4LINUX DRIVER
   M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   T:    git git://linuxtv.org/media_tree.git
   S:    Odd fixes
   F:    Documentation/video4linux/*.saa7134
@@@ -9423,10 -9263,8 +9445,10 @@@ F:    drivers/regulator/s5m*.
   F:    drivers/clk/clk-s2mps11.c
   F:    drivers/rtc/rtc-s5m.c
   F:    include/linux/mfd/samsung/
- -F:    Documentation/devicetree/bindings/regulator/s5m8767-regulator.txt
- -F:    Documentation/devicetree/bindings/mfd/s2mp*.txt
+ +F:    Documentation/devicetree/bindings/mfd/samsung,sec-core.txt
+ +F:    Documentation/devicetree/bindings/regulator/samsung,s2m*.txt
+ +F:    Documentation/devicetree/bindings/regulator/samsung,s5m*.txt
+ +F:    Documentation/devicetree/bindings/clock/samsung,s2mps11.txt
   
   SAMSUNG S5P/EXYNOS4 SOC SERIES CAMERA SUBSYSTEM DRIVERS
   M:    Kyungmin Park <kyungmin.park@samsung.com>
@@@ -9442,7 -9280,7 +9464,7 @@@ L:      linux-media@vger.kernel.or
   L:    linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
   S:    Maintained
   F:    drivers/media/platform/s3c-camif/
- -F:    include/media/s3c_camif.h
+ +F:    include/media/drv-intf/s3c_camif.h
   
   SAMSUNG S5C73M3 CAMERA DRIVER
   M:    Kyungmin Park <kyungmin.park@samsung.com>
@@@ -9484,7 -9322,7 +9506,7 @@@ M:      Lukasz Majewski <l.majewski@samsung.
   L:    linux-pm@vger.kernel.org
   L:    linux-samsung-soc@vger.kernel.org
   S:    Supported
- -T:    https://github.com/lmajewski/linux-samsung-thermal.git
+ +T:    git https://github.com/lmajewski/linux-samsung-thermal.git
   F:    drivers/thermal/samsung/
   
   SAMSUNG USB2 PHY DRIVER
@@@ -9550,7 -9388,7 +9572,7 @@@ M:      Andreas Noever <andreas.noever@gmail
   S:    Maintained
   F:    drivers/thunderbolt/
   
- -TIMEKEEPING, CLOCKSOURCE CORE, NTP
+ +TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
   M:    John Stultz <john.stultz@linaro.org>
   M:    Thomas Gleixner <tglx@linutronix.de>
   L:    linux-kernel@vger.kernel.org
@@@ -9563,7 -9401,6 +9585,7 @@@ F:      include/uapi/linux/time.
   F:    include/uapi/linux/timex.h
   F:    kernel/time/clocksource.c
   F:    kernel/time/time*.c
+ +F:    kernel/time/alarmtimer.c
   F:    kernel/time/ntp.c
   F:    tools/testing/selftests/timers/
   
@@@ -9818,7 -9655,7 +9840,7 @@@ 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:    https://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
@@@ -9828,7 -9665,7 +9850,7 @@@ 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:    https://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
@@@ -9839,7 -9676,7 +9861,7 @@@ SI470X FM RADIO RECEIVER I2C DRIVE
   M:    Hans Verkuil <hverkuil@xs4all.nl>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   S:    Odd Fixes
   F:    drivers/media/radio/si470x/radio-si470x-i2c.c
   
@@@ -9847,7 -9684,7 +9869,7 @@@ SI470X FM RADIO RECEIVER USB DRIVE
   M:    Hans Verkuil <hverkuil@xs4all.nl>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   S:    Maintained
   F:    drivers/media/radio/si470x/radio-si470x-common.c
   F:    drivers/media/radio/si470x/radio-si470x.h
@@@ -9857,7 -9694,7 +9879,7 @@@ SI4713 FM RADIO TRANSMITTER I2C DRIVE
   M:    Eduardo Valentin <edubezval@gmail.com>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   S:    Odd Fixes
   F:    drivers/media/radio/si4713/si4713.?
   
@@@ -9865,7 -9702,7 +9887,7 @@@ SI4713 FM RADIO TRANSMITTER PLATFORM DR
   M:    Eduardo Valentin <edubezval@gmail.com>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   S:    Odd Fixes
   F:    drivers/media/radio/si4713/radio-platform-si4713.c
   
@@@ -9873,14 -9710,14 +9895,14 @@@ SI4713 FM RADIO TRANSMITTER USB DRIVE
   M:    Hans Verkuil <hverkuil@xs4all.nl>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   S:    Maintained
   F:    drivers/media/radio/si4713/radio-usb-si4713.c
   
   SIANO DVB DRIVER
   M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   T:    git git://linuxtv.org/media_tree.git
   S:    Odd fixes
   F:    drivers/media/common/siano/
@@@ -9905,7 -9742,7 +9927,7 @@@ SH_VOU V4L2 OUTPUT DRIVE
   L:    linux-media@vger.kernel.org
   S:    Orphan
   F:    drivers/media/platform/sh_vou.c
- -F:    include/media/sh_vou.h
+ +F:    include/media/drv-intf/sh_vou.h
   
   SIMPLE FIRMWARE INTERFACE (SFI)
   M:    Len Brown <lenb@kernel.org>
@@@ -9946,7 -9783,7 +9968,7 @@@ F:      drivers/i2c/busses/i2c-davinci.
   TI DAVINCI SERIES MEDIA DRIVER
   M:    "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://linuxtv.org
   Q:    http://patchwork.linuxtv.org/project/linux-media/list/
   T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
   S:    Maintained
@@@ -9956,7 -9793,7 +9978,7 @@@ F:      include/media/davinci
   TI AM437X VPFE DRIVER
   M:    "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://linuxtv.org
   Q:    http://patchwork.linuxtv.org/project/linux-media/list/
   T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
   S:    Maintained
@@@ -9965,12 -9802,12 +9987,12 @@@ F:   drivers/media/platform/am437x
   OV2659 OMNIVISION SENSOR DRIVER
   M:    "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://linuxtv.org
   Q:    http://patchwork.linuxtv.org/project/linux-media/list/
   T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
   S:    Maintained
   F:    drivers/media/i2c/ov2659.c
- -F:    include/media/ov2659.h
+ +F:    include/media/i2c/ov2659.h
   
   SILICON MOTION SM712 FRAME BUFFER DRIVER
   M:    Sudip Mukherjee <sudipm.mukherjee@gmail.com>
@@@ -10059,7 -9896,7 +10081,7 @@@ M:    Sakari Ailus <sakari.ailus@iki.fi
   L:    linux-media@vger.kernel.org
   S:    Maintained
   F:    drivers/media/i2c/smiapp/
- -F:    include/media/smiapp.h
+ +F:    include/media/i2c/smiapp.h
   F:    drivers/media/i2c/smiapp-pll.c
   F:    drivers/media/i2c/smiapp-pll.h
   F:    include/uapi/linux/smiapp.h
@@@ -10136,8 -9973,8 +10158,8 @@@ S:    Supporte
   F:    drivers/media/pci/solo6x10/
   
   SOFTWARE RAID (Multiple Disks) SUPPORT
- -M:    Neil Brown <neilb@suse.com>
   L:    linux-raid@vger.kernel.org
+ +T:    git git://neil.brown.name/md
   S:    Supported
   F:    drivers/md/
   F:    include/linux/raid/
@@@ -10223,7 -10060,7 +10245,7 @@@ F:   sound/soc/soc-generic-dmaengine-pcm.
   SP2 MEDIA DRIVER
   M:    Olli Salonen <olli.salonen@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://linuxtv.org
   Q:    http://patchwork.linuxtv.org/project/linux-media/list/
   S:    Maintained
   F:    drivers/media/dvb-frontends/sp2*
@@@ -10309,7 -10146,6 +10331,7 @@@ SQUASHFS FILE SYSTE
   M:    Phillip Lougher <phillip@squashfs.org.uk>
   L:    squashfs-devel@lists.sourceforge.net (subscribers-only)
   W:    http://squashfs.org.uk
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git
   S:    Maintained
   F:    Documentation/filesystems/squashfs.txt
   F:    fs/squashfs/
@@@ -10475,11 -10311,9 +10497,11 @@@ S: Maintaine
   F:    drivers/net/ethernet/dlink/sundance.c
   
   SUPERH
+ +M:    Yoshinori Sato <ysato@users.sourceforge.jp>
+ +M:    Rich Felker <dalias@libc.org>
   L:    linux-sh@vger.kernel.org
   Q:    http://patchwork.kernel.org/project/linux-sh/list/
- -S:    Orphan
+ +S:    Maintained
   F:    Documentation/sh/
   F:    arch/sh/
   F:    drivers/sh/
@@@ -10508,7 -10342,6 +10530,7 @@@ F:   arch/x86/boot/video
   SWIOTLB SUBSYSTEM
   M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
   L:    linux-kernel@vger.kernel.org
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git
   S:    Supported
   F:    lib/swiotlb.c
   F:    arch/*/kernel/pci-swiotlb.c
@@@ -10589,7 -10422,7 +10611,7 @@@ F:   net/ipv4/tcp_lp.
   TDA10071 MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -10599,7 -10432,7 +10621,7 @@@ F:   drivers/media/dvb-frontends/tda10071
   TDA18212 MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -10609,7 -10442,7 +10631,7 @@@ F:   drivers/media/tuners/tda18212
   TDA18218 MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -10619,7 -10452,7 +10641,7 @@@ F:   drivers/media/tuners/tda18218
   TDA18271 MEDIA DRIVER
   M:    Michael Krufky <mkrufky@linuxtv.org>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://linuxtv.org
   W:    http://github.com/mkrufky
   Q:    http://patchwork.linuxtv.org/project/linux-media/list/
   T:    git git://linuxtv.org/mkrufky/tuners.git
@@@ -10629,7 -10462,7 +10651,7 @@@ F:   drivers/media/tuners/tda18271
   TDA827x MEDIA DRIVER
   M:    Michael Krufky <mkrufky@linuxtv.org>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://linuxtv.org
   W:    http://github.com/mkrufky
   Q:    http://patchwork.linuxtv.org/project/linux-media/list/
   T:    git git://linuxtv.org/mkrufky/tuners.git
@@@ -10639,7 -10472,7 +10661,7 @@@ F:   drivers/media/tuners/tda8290.
   TDA8290 MEDIA DRIVER
   M:    Michael Krufky <mkrufky@linuxtv.org>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://linuxtv.org
   W:    http://github.com/mkrufky
   Q:    http://patchwork.linuxtv.org/project/linux-media/list/
   T:    git git://linuxtv.org/mkrufky/tuners.git
@@@ -10650,14 -10483,14 +10672,14 @@@ TDA9840 MEDIA DRIVE
   M:    Hans Verkuil <hverkuil@xs4all.nl>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   S:    Maintained
   F:    drivers/media/i2c/tda9840*
   
   TEA5761 TUNER DRIVER
   M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   T:    git git://linuxtv.org/media_tree.git
   S:    Odd fixes
   F:    drivers/media/tuners/tea5761.*
@@@ -10665,7 -10498,7 +10687,7 @@@
   TEA5767 TUNER DRIVER
   M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   T:    git git://linuxtv.org/media_tree.git
   S:    Maintained
   F:    drivers/media/tuners/tea5767.*
@@@ -10674,7 -10507,7 +10696,7 @@@ TEA6415C MEDIA DRIVE
   M:    Hans Verkuil <hverkuil@xs4all.nl>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   S:    Maintained
   F:    drivers/media/i2c/tea6415c*
   
@@@ -10682,7 -10515,7 +10704,7 @@@ TEA6420 MEDIA DRIVE
   M:    Hans Verkuil <hverkuil@xs4all.nl>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   S:    Maintained
   F:    drivers/media/i2c/tea6420*
   
@@@ -10772,7 -10605,6 +10794,7 @@@ TENSILICA XTENSA PORT (xtensa
   M:    Chris Zankel <chris@zankel.net>
   M:    Max Filippov <jcmvbkbc@gmail.com>
   L:    linux-xtensa@linux-xtensa.org
+ +T:    git git://github.com/czankel/xtensa-linux.git
   S:    Maintained
   F:    arch/xtensa/
   F:    drivers/irqchip/irq-xtensa-*
@@@ -10781,7 -10613,7 +10803,7 @@@ THANKO'S RAREMONO AM/FM/SW RADIO RECEIV
   M:    Hans Verkuil <hverkuil@xs4all.nl>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   S:    Maintained
   F:    drivers/media/radio/radio-raremono.c
   
@@@ -10931,7 -10763,6 +10953,7 @@@ F:   net/tipc
   TILE ARCHITECTURE
   M:    Chris Metcalf <cmetcalf@ezchip.com>
   W:    http://www.ezchip.com/scm/
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git
   S:    Supported
   F:    arch/tile/
   F:    drivers/char/tile-srom.c
@@@ -11006,7 -10837,7 +11028,7 @@@ M:   Mats Randgaard <matrandg@cisco.com
   L:    linux-media@vger.kernel.org
   S:    Maintained
   F:    drivers/media/i2c/tc358743*
- -F:    include/media/tc358743.h
+ +F:    include/media/i2c/tc358743.h
   
   TMIO MMC DRIVER
   M:    Ian Molton <ian@mnementh.co.uk>
@@@ -11034,7 -10865,7 +11056,7 @@@ F:   mm/shmem.
   TM6000 VIDEO4LINUX DRIVER
   M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   T:    git git://linuxtv.org/media_tree.git
   S:    Odd fixes
   F:    drivers/media/usb/tm6000/
@@@ -11043,7 -10874,7 +11065,7 @@@ TW68 VIDEO4LINUX DRIVE
   M:    Hans Verkuil <hverkuil@xs4all.nl>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   S:    Odd Fixes
   F:    drivers/media/pci/tw68/
   
@@@ -11055,7 -10886,7 +11077,7 @@@ R:   Jason Gunthorpe <jgunthorpe@obsidian
   W:    http://tpmdd.sourceforge.net
   L:    tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
   Q:    git git://github.com/PeterHuewe/linux-tpmdd.git
- -T:    https://github.com/PeterHuewe/linux-tpmdd
+ +T:    git https://github.com/PeterHuewe/linux-tpmdd
   S:    Maintained
   F:    drivers/char/tpm/
   
@@@ -11104,7 -10935,7 +11126,7 @@@ F:   include/uapi/linux/tty.
   TUA9001 MEDIA DRIVER
   M:    Antti Palosaari <crope@iki.fi>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org/
+ +W:    https://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
@@@ -11306,7 -11137,6 +11328,7 @@@ F:   include/linux/usb/gadget
   
   USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...)
   M:    Jiri Kosina <jikos@kernel.org>
+ +R:    Benjamin Tissoires <benjamin.tissoires@redhat.com>
   L:    linux-usb@vger.kernel.org
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
   S:    Maintained
@@@ -11348,7 -11178,7 +11370,7 @@@ F:   Documentation/usb/ohci.tx
   F:    drivers/usb/host/ohci*
   
   USB OTG FSM (Finite State Machine)
- -M:    Peter Chen <Peter.Chen@freescale.com>
+ +M:    Peter Chen <Peter.Chen@nxp.com>
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
   L:    linux-usb@vger.kernel.org
   S:    Maintained
@@@ -11384,13 -11214,6 +11406,13 @@@ L: linux-usb@vger.kernel.or
   S:    Supported
   F:    drivers/usb/class/usblp.c
   
+ +USB QMI WWAN NETWORK DRIVER
+ +M:    Bjørn Mork <bjorn@mork.no>
+ +L:    netdev@vger.kernel.org
+ +S:    Maintained
+ +F:    Documentation/ABI/testing/sysfs-class-net-qmi
+ +F:    drivers/net/usb/qmi_wwan.c
+ +
   USB RTL8150 DRIVER
   M:    Petko Manolov <petkan@nucleusys.com>
   L:    linux-usb@vger.kernel.org
@@@ -11459,7 -11282,7 +11481,7 @@@ USB VISION DRIVE
   M:    Hans Verkuil <hverkuil@xs4all.nl>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   S:    Odd Fixes
   F:    drivers/media/usb/usbvision/
   
@@@ -11487,7 -11310,7 +11509,7 @@@ USB ZD1201 DRIVE
   L:    linux-wireless@vger.kernel.org
   W:    http://linux-lc100020.sourceforge.net
   S:    Orphan
- -F:    drivers/net/wireless/zd1201.*
+ +F:    drivers/net/wireless/zydas/zd1201.*
   
   USB ZR364XX DRIVER
   M:    Antoine Jacquet <royale@zerezo.com>
@@@ -11512,7 -11335,6 +11534,7 @@@ M:   Richard Weinberger <richard@nod.at
   L:    user-mode-linux-devel@lists.sourceforge.net
   L:    user-mode-linux-user@lists.sourceforge.net
   W:    http://user-mode-linux.sourceforge.net
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git
   S:    Maintained
   F:    Documentation/virtual/uml/
   F:    arch/um/
@@@ -11559,7 -11381,6 +11581,7 @@@ F:   fs/fat
   VFIO DRIVER
   M:    Alex Williamson <alex.williamson@redhat.com>
   L:    kvm@vger.kernel.org
+ +T:    git git://github.com/awilliam/linux-vfio.git
   S:    Maintained
   F:    Documentation/vfio.txt
   F:    drivers/vfio/
@@@ -11629,7 -11450,6 +11651,7 @@@ M:   "Michael S. Tsirkin" <mst@redhat.com
   L:    kvm@vger.kernel.org
   L:    virtualization@lists.linux-foundation.org
   L:    netdev@vger.kernel.org
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git
   S:    Maintained
   F:    drivers/vhost/
   F:    include/uapi/linux/vhost.h
@@@ -11676,7 -11496,7 +11698,7 @@@ VIVID VIRTUAL VIDEO DRIVE
   M:    Hans Verkuil <hverkuil@xs4all.nl>
   L:    linux-media@vger.kernel.org
   T:    git git://linuxtv.org/media_tree.git
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   S:    Maintained
   F:    drivers/media/platform/vivid/*
   
@@@ -11822,7 -11642,6 +11844,7 @@@ F:   drivers/input/tablet/wacom_serial4.
   
   WATCHDOG DEVICE DRIVERS
   M:    Wim Van Sebroeck <wim@iguana.be>
+ +R:    Guenter Roeck <linux@roeck-us.net>
   L:    linux-watchdog@vger.kernel.org
   W:    http://www.linux-watchdog.org/
   T:    git git://www.linux-watchdog.org/linux-watchdog.git
@@@ -11894,7 -11713,6 +11916,7 @@@ F:   drivers/input/touchscreen/wm831x-ts.
   F:    drivers/input/touchscreen/wm97*.c
   F:    drivers/mfd/arizona*
   F:    drivers/mfd/wm*.c
+ +F:    drivers/mfd/cs47l24*
   F:    drivers/power/wm83*.c
   F:    drivers/rtc/rtc-wm83*.c
   F:    drivers/regulator/wm8*.c
@@@ -11908,7 -11726,6 +11930,7 @@@ F:   include/linux/wm97xx.
   F:    include/sound/wm????.h
   F:    sound/soc/codecs/arizona.?
   F:    sound/soc/codecs/wm*
+ +F:    sound/soc/codecs/cs47l24*
   
   WORKQUEUE
   M:    Tejun Heo <tj@kernel.org>
@@@ -11968,7 -11785,7 +11990,7 @@@ F:   arch/x86/entry/vdso
   XC2028/3028 TUNER DRIVER
   M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
   L:    linux-media@vger.kernel.org
- -W:    http://linuxtv.org
+ +W:    https://linuxtv.org
   T:    git git://linuxtv.org/media_tree.git
   S:    Maintained
   F:    drivers/media/tuners/tuner-xc2028.*
@@@ -12046,7 -11863,7 +12068,7 @@@ M:   Dave Chinner <david@fromorbit.com
   M:    xfs@oss.sgi.com
   L:    xfs@oss.sgi.com
   W:    http://oss.sgi.com/projects/xfs
- -T:    git git://oss.sgi.com/xfs/xfs.git
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git
   S:    Supported
   F:    Documentation/filesystems/xfs.txt
   F:    fs/xfs/
@@@ -12124,7 -11941,7 +12146,7 @@@ W:   http://zd1211.ath.cx/wiki/DriverRewr
   L:    linux-wireless@vger.kernel.org
   L:    zd1211-devs@lists.sourceforge.net (subscribers-only)
   S:    Maintained
- -F:    drivers/net/wireless/zd1211rw/
+ +F:    drivers/net/wireless/zydas/zd1211rw/
   
   ZPOOL COMPRESSED PAGE STORAGE API
   M:    Dan Streetman <ddstreet@ieee.org>
@@@ -12137,7 -11954,7 +12159,7 @@@ ZR36067 VIDEO FOR LINUX DRIVE
   L:    mjpeg-users@lists.sourceforge.net
   L:    linux-media@vger.kernel.org
   W:    http://mjpeg.sourceforge.net/driver-zoran/
- -T:    hg http://linuxtv.org/hg/v4l-dvb
+ +T:    hg https://linuxtv.org/hg/v4l-dvb
   S:    Odd Fixes
   F:    drivers/media/pci/zoran/
   
diff --combined arch/mips/Kconfig

index fbf3f6670b69a58f23bf3878eb0d5d2df3edeaec,178cf1fbd0334b5e16a926efe87eab6289ca3ce0..57a945e832f43ff711fe04d1fa8a52fe1970f000
--- 1/arch/mips/Kconfig
--- 2/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -31,6 -31,7 +31,6 @@@ config MIP
         select RTC_LIB if !MACH_LOONGSON64
         select GENERIC_ATOMIC64 if !64BIT
         select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
- -      select HAVE_DMA_ATTRS
         select HAVE_DMA_CONTIGUOUS
         select HAVE_DMA_API_DEBUG
         select GENERIC_IRQ_PROBE
@@@ -169,6 -170,7 +169,7 @@@ config BMIPS_GENERI
         select USB_EHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
         select USB_OHCI_BIG_ENDIAN_DESC if CPU_BIG_ENDIAN
         select USB_OHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
+       select ARCH_WANT_OPTIONAL_GPIOLIB
         help
           Build a generic DT-based kernel image that boots on select
           BCM33xx cable modem chips, BCM63xx DSL chips, and BCM7xxx set-top
@@@ -480,6 -482,14 +481,14 @@@ config MIPS_MALT
           This enables support for the MIPS Technologies Malta evaluation
           board.
   
+ config MACH_PIC32
+       bool "Microchip PIC32 Family"
+       help
+         This enables support for the Microchip PIC32 family of platforms.
+ 
+         Microchip PIC32 is a family of general-purpose 32 bit MIPS core
+         microcontrollers.
+ 
   config MIPS_SEAD3
         bool "MIPS SEAD3 board"
         select BOOT_ELF32
@@@ -979,6 -989,7 +988,7 @@@ source "arch/mips/jazz/Kconfig
   source "arch/mips/jz4740/Kconfig"
   source "arch/mips/lantiq/Kconfig"
   source "arch/mips/lasat/Kconfig"
+ source "arch/mips/pic32/Kconfig"
   source "arch/mips/pistachio/Kconfig"
   source "arch/mips/pmcs-msp71xx/Kconfig"
   source "arch/mips/ralink/Kconfig"
@@@ -1755,6 -1766,10 +1765,10 @@@ config SYS_SUPPORTS_ZBOOT_UART1655
         bool
         select SYS_SUPPORTS_ZBOOT
   
+ config SYS_SUPPORTS_ZBOOT_UART_PROM
+       bool
+       select SYS_SUPPORTS_ZBOOT
+ 
   config CPU_LOONGSON2
         bool
         select CPU_SUPPORTS_32BIT_KERNEL
@@@ -2017,7 -2032,8 +2031,8 @@@ config KVM_GUES
         bool "KVM Guest Kernel"
         depends on BROKEN_ON_SMP
         help
-         Select this option if building a guest kernel for KVM (Trap & Emulate) mode
+         Select this option if building a guest kernel for KVM (Trap & Emulate)
+         mode.
   
   config KVM_GUEST_TIMER_FREQ
         int "Count/Compare Timer Frequency (MHz)"
diff --combined arch/mips/boot/dts/brcm/bcm6328.dtsi

index d52ce3d07f16dee81c5982212fe69f8cddc015d0,d61b1616b604552be9a30f89eb42539de6838b14..459b9b252c3b73fe2c95362177655b3a6f154a6f
--- 1/arch/mips/boot/dts/brcm/bcm6328.dtsi
--- 2/arch/mips/boot/dts/brcm/bcm6328.dtsi
+++ b/arch/mips/boot/dts/brcm/bcm6328.dtsi
@@@ -31,6 -31,7 +31,7 @@@
         };
   
         aliases {
+               leds0 = &leds0;
                 uart0 = &uart0;
         };
   
@@@ -73,6 -74,7 +74,6 @@@
                 timer: timer@10000040 {
                         compatible = "syscon";
                         reg = <0x10000040 0x2c>;
- -                      little-endian;
                 };
   
                 reboot {
@@@ -81,5 -83,13 +82,13 @@@
                         offset = <0x28>;
                         mask = <0x1>;
                 };
+ 
+               leds0: led-controller@10000800 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "brcm,bcm6328-leds";
+                       reg = <0x10000800 0x24>;
+                       status = "disabled";
+               };
         };
   };
diff --combined arch/mips/include/asm/kvm_host.h

index 7c191443c7ea199f876a2c495b2b6d3f41bfc1d5,ba8d9acdba30cd59355e87563c8241e31e0cab0f..f6b12790716c071db8a3ce17971dd146c30025f5
--- 1/arch/mips/include/asm/kvm_host.h
--- 2/arch/mips/include/asm/kvm_host.h
+++ b/arch/mips/include/asm/kvm_host.h
@@@ -58,7 -58,7 +58,7 @@@
   #define KVM_MAX_VCPUS         1
   #define KVM_USER_MEM_SLOTS    8
   /* memory slots that does not exposed to userspace */
- #define KVM_PRIVATE_MEM_SLOTS         0
+ #define KVM_PRIVATE_MEM_SLOTS 0
   
   #define KVM_COALESCED_MMIO_PAGE_OFFSET 1
   #define KVM_HALT_POLL_NS_DEFAULT 500000
@@@ -92,18 -92,10 +92,10 @@@
   #define KVM_INVALID_INST              0xdeadbeef
   #define KVM_INVALID_ADDR              0xdeadbeef
   
- #define KVM_MALTA_GUEST_RTC_ADDR      0xb8000070UL
- 
- #define GUEST_TICKS_PER_JIFFY         (40000000/HZ)
- #define MS_TO_NS(x)                   (x * 1E6L)
- 
- #define CAUSEB_DC                     27
- #define CAUSEF_DC                     (_ULCAST_(1) << 27)
- 
   extern atomic_t kvm_mips_instance;
- -extern pfn_t(*kvm_mips_gfn_to_pfn) (struct kvm *kvm, gfn_t gfn);
- -extern void (*kvm_mips_release_pfn_clean) (pfn_t pfn);
- -extern bool(*kvm_mips_is_error_pfn) (pfn_t pfn);
+ +extern kvm_pfn_t (*kvm_mips_gfn_to_pfn)(struct kvm *kvm, gfn_t gfn);
+ +extern void (*kvm_mips_release_pfn_clean)(kvm_pfn_t pfn);
+ +extern bool (*kvm_mips_is_error_pfn)(kvm_pfn_t pfn);
   
   struct kvm_vm_stat {
         u32 remote_tlb_flush;
@@@ -289,34 -281,6 +281,6 @@@ enum mips_mmu_types 
         MMU_TYPE_R8000
   };
   
- /*
-  * Trap codes
-  */
- #define T_INT                 0       /* Interrupt pending */
- #define T_TLB_MOD             1       /* TLB modified fault */
- #define T_TLB_LD_MISS         2       /* TLB miss on load or ifetch */
- #define T_TLB_ST_MISS         3       /* TLB miss on a store */
- #define T_ADDR_ERR_LD         4       /* Address error on a load or ifetch */
- #define T_ADDR_ERR_ST         5       /* Address error on a store */
- #define T_BUS_ERR_IFETCH      6       /* Bus error on an ifetch */
- #define T_BUS_ERR_LD_ST               7       /* Bus error on a load or store */
- #define T_SYSCALL             8       /* System call */
- #define T_BREAK                       9       /* Breakpoint */
- #define T_RES_INST            10      /* Reserved instruction exception */
- #define T_COP_UNUSABLE                11      /* Coprocessor unusable */
- #define T_OVFLOW              12      /* Arithmetic overflow */
- 
- /*
-  * Trap definitions added for r4000 port.
-  */
- #define T_TRAP                        13      /* Trap instruction */
- #define T_VCEI                        14      /* Virtual coherency exception */
- #define T_MSAFPE              14      /* MSA floating point exception */
- #define T_FPE                 15      /* Floating point exception */
- #define T_MSADIS              21      /* MSA disabled exception */
- #define T_WATCH                       23      /* Watch address reference */
- #define T_VCED                        31      /* Virtual coherency data */
- 
   /* Resume Flags */
   #define RESUME_FLAG_DR                (1<<0)  /* Reload guest nonvolatile state? */
   #define RESUME_FLAG_HOST      (1<<1)  /* Resume host? */
@@@ -686,7 -650,6 +650,6 @@@ extern void kvm_mips_dump_host_tlbs(voi
   extern void kvm_mips_dump_guest_tlbs(struct kvm_vcpu *vcpu);
   extern void kvm_mips_flush_host_tlb(int skip_kseg0);
   extern int kvm_mips_host_tlb_inv(struct kvm_vcpu *vcpu, unsigned long entryhi);
- extern int kvm_mips_host_tlb_inv_index(struct kvm_vcpu *vcpu, int index);
   
   extern int kvm_mips_guest_tlb_lookup(struct kvm_vcpu *vcpu,
                                      unsigned long entryhi);
diff --combined arch/mips/include/asm/pgtable.h

index 6995b4a02e2359bf6e2e1b8493bcae55443753f1,18826aa15a7cec740b8e6a9eddba1e7fa82ec615..9a4fe0133ff1c7d82685d426dc1a91b371a972a6
--- 1/arch/mips/include/asm/pgtable.h
--- 2/arch/mips/include/asm/pgtable.h
+++ b/arch/mips/include/asm/pgtable.h
@@@ -353,7 -353,7 +353,7 @@@ static inline pte_t pte_mkdirty(pte_t p
   static inline pte_t pte_mkyoung(pte_t pte)
   {
         pte_val(pte) |= _PAGE_ACCESSED;
- #ifdef CONFIG_CPU_MIPSR2
+ #if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6)
         if (!(pte_val(pte) & _PAGE_NO_READ))
                 pte_val(pte) |= _PAGE_SILENT_READ;
         else
@@@ -482,9 -482,27 +482,9 @@@ static inline pmd_t pmd_mkhuge(pmd_t pm
         return pmd;
   }
   
- -static inline int pmd_trans_splitting(pmd_t pmd)
- -{
- -      return !!(pmd_val(pmd) & _PAGE_SPLITTING);
- -}
- -
- -static inline pmd_t pmd_mksplitting(pmd_t pmd)
- -{
- -      pmd_val(pmd) |= _PAGE_SPLITTING;
- -
- -      return pmd;
- -}
- -
   extern void set_pmd_at(struct mm_struct *mm, unsigned long addr,
                        pmd_t *pmdp, pmd_t pmd);
   
- -#define __HAVE_ARCH_PMDP_SPLITTING_FLUSH
- -/* Extern to avoid header file madness */
- -extern void pmdp_splitting_flush(struct vm_area_struct *vma,
- -                                      unsigned long address,
- -                                      pmd_t *pmdp);
- -
   #define __HAVE_ARCH_PMD_WRITE
   static inline int pmd_write(pmd_t pmd)
   {
@@@ -542,7 -560,7 +542,7 @@@ static inline pmd_t pmd_mkyoung(pmd_t p
   {
         pmd_val(pmd) |= _PAGE_ACCESSED;
   
- #ifdef CONFIG_CPU_MIPSR2
+ #if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6)
         if (!(pmd_val(pmd) & _PAGE_NO_READ))
                 pmd_val(pmd) |= _PAGE_SILENT_READ;
         else
diff --combined arch/mips/kvm/emulate.c

index 1b675c7ce89f89d25f3457659405419505a8158d,845fd0d910409225e56332b26b4aabdf1b74f7c5..b37954cc880d6ce06d9ca408962a4fabf7e7de06
--- 1/arch/mips/kvm/emulate.c
--- 2/arch/mips/kvm/emulate.c
+++ b/arch/mips/kvm/emulate.c
@@@ -20,6 -20,7 +20,7 @@@
   #include <linux/random.h>
   #include <asm/page.h>
   #include <asm/cacheflush.h>
+ #include <asm/cacheops.h>
   #include <asm/cpu-info.h>
   #include <asm/mmu_context.h>
   #include <asm/tlbflush.h>
@@@ -29,7 -30,6 +30,6 @@@
   #include <asm/r4kcache.h>
   #define CONFIG_MIPS_MT
   
- #include "opcode.h"
   #include "interrupt.h"
   #include "commpage.h"
   
@@@ -1239,21 -1239,20 +1239,20 @@@ enum emulation_result kvm_mips_emulate_
                         er = EMULATE_FAIL;
                         break;
   
-               case mfmcz_op:
+               case mfmc0_op:
   #ifdef KVM_MIPS_DEBUG_COP0_COUNTERS
                         cop0->stat[MIPS_CP0_STATUS][0]++;
   #endif
-                       if (rt != 0) {
+                       if (rt != 0)
                                 vcpu->arch.gprs[rt] =
                                     kvm_read_c0_guest_status(cop0);
-                       }
                         /* EI */
                         if (inst & 0x20) {
-                               kvm_debug("[%#lx] mfmcz_op: EI\n",
+                               kvm_debug("[%#lx] mfmc0_op: EI\n",
                                           vcpu->arch.pc);
                                 kvm_set_c0_guest_status(cop0, ST0_IE);
                         } else {
-                               kvm_debug("[%#lx] mfmcz_op: DI\n",
+                               kvm_debug("[%#lx] mfmc0_op: DI\n",
                                           vcpu->arch.pc);
                                 kvm_clear_c0_guest_status(cop0, ST0_IE);
                         }
@@@ -1525,7 -1524,7 +1524,7 @@@ int kvm_mips_sync_icache(unsigned long 
         struct kvm *kvm = vcpu->kvm;
         unsigned long pa;
         gfn_t gfn;
- -      pfn_t pfn;
+ +      kvm_pfn_t pfn;
   
         gfn = va >> PAGE_SHIFT;
   
@@@ -1545,19 -1544,6 +1544,6 @@@
         return 0;
   }
   
- #define MIPS_CACHE_OP_INDEX_INV         0x0
- #define MIPS_CACHE_OP_INDEX_LD_TAG      0x1
- #define MIPS_CACHE_OP_INDEX_ST_TAG      0x2
- #define MIPS_CACHE_OP_IMP               0x3
- #define MIPS_CACHE_OP_HIT_INV           0x4
- #define MIPS_CACHE_OP_FILL_WB_INV       0x5
- #define MIPS_CACHE_OP_HIT_HB            0x6
- #define MIPS_CACHE_OP_FETCH_LOCK        0x7
- 
- #define MIPS_CACHE_ICACHE               0x0
- #define MIPS_CACHE_DCACHE               0x1
- #define MIPS_CACHE_SEC                  0x3
- 
   enum emulation_result kvm_mips_emulate_cache(uint32_t inst, uint32_t *opc,
                                              uint32_t cause,
                                              struct kvm_run *run,
@@@ -1582,8 -1568,8 +1568,8 @@@
         base = (inst >> 21) & 0x1f;
         op_inst = (inst >> 16) & 0x1f;
         offset = (int16_t)inst;
-       cache = (inst >> 16) & 0x3;
-       op = (inst >> 18) & 0x7;
+       cache = op_inst & CacheOp_Cache;
+       op = op_inst & CacheOp_Op;
   
         va = arch->gprs[base] + offset;
   
@@@ -1595,14 -1581,14 +1581,14 @@@
          * invalidate the caches entirely by stepping through all the
          * ways/indexes
          */
-       if (op == MIPS_CACHE_OP_INDEX_INV) {
+       if (op == Index_Writeback_Inv) {
                 kvm_debug("@ %#lx/%#lx CACHE (cache: %#x, op: %#x, base[%d]: %#lx, offset: %#x\n",
                           vcpu->arch.pc, vcpu->arch.gprs[31], cache, op, base,
                           arch->gprs[base], offset);
   
-               if (cache == MIPS_CACHE_DCACHE)
+               if (cache == Cache_D)
                         r4k_blast_dcache();
-               else if (cache == MIPS_CACHE_ICACHE)
+               else if (cache == Cache_I)
                         r4k_blast_icache();
                 else {
                         kvm_err("%s: unsupported CACHE INDEX operation\n",
@@@ -1675,9 -1661,7 +1661,7 @@@
   
   skip_fault:
         /* XXXKYMA: Only a subset of cache ops are supported, used by Linux */
-       if (cache == MIPS_CACHE_DCACHE
-           && (op == MIPS_CACHE_OP_FILL_WB_INV
-               || op == MIPS_CACHE_OP_HIT_INV)) {
+       if (op_inst == Hit_Writeback_Inv_D || op_inst == Hit_Invalidate_D) {
                 flush_dcache_line(va);
   
   #ifdef CONFIG_KVM_MIPS_DYN_TRANS
@@@ -1687,7 -1671,7 +1671,7 @@@
                  */
                 kvm_mips_trans_cache_va(inst, opc, vcpu);
   #endif
-       } else if (op == MIPS_CACHE_OP_HIT_INV && cache == MIPS_CACHE_ICACHE) {
+       } else if (op_inst == Hit_Invalidate_I) {
                 flush_dcache_line(va);
                 flush_icache_line(va);
   
@@@ -1781,7 -1765,7 +1765,7 @@@ enum emulation_result kvm_mips_emulate_
                 kvm_debug("Delivering SYSCALL @ pc %#lx\n", arch->pc);
   
                 kvm_change_c0_guest_cause(cop0, (0xff),
-                                         (T_SYSCALL << CAUSEB_EXCCODE));
+                                         (EXCCODE_SYS << CAUSEB_EXCCODE));
   
                 /* Set PC to the exception entry point */
                 arch->pc = KVM_GUEST_KSEG0 + 0x180;
@@@ -1828,7 -1812,7 +1812,7 @@@ enum emulation_result kvm_mips_emulate_
         }
   
         kvm_change_c0_guest_cause(cop0, (0xff),
-                                 (T_TLB_LD_MISS << CAUSEB_EXCCODE));
+                                 (EXCCODE_TLBL << CAUSEB_EXCCODE));
   
         /* setup badvaddr, context and entryhi registers for the guest */
         kvm_write_c0_guest_badvaddr(cop0, vcpu->arch.host_cp0_badvaddr);
@@@ -1874,7 -1858,7 +1858,7 @@@ enum emulation_result kvm_mips_emulate_
         }
   
         kvm_change_c0_guest_cause(cop0, (0xff),
-                                 (T_TLB_LD_MISS << CAUSEB_EXCCODE));
+                                 (EXCCODE_TLBL << CAUSEB_EXCCODE));
   
         /* setup badvaddr, context and entryhi registers for the guest */
         kvm_write_c0_guest_badvaddr(cop0, vcpu->arch.host_cp0_badvaddr);
@@@ -1918,7 -1902,7 +1902,7 @@@ enum emulation_result kvm_mips_emulate_
         }
   
         kvm_change_c0_guest_cause(cop0, (0xff),
-                                 (T_TLB_ST_MISS << CAUSEB_EXCCODE));
+                                 (EXCCODE_TLBS << CAUSEB_EXCCODE));
   
         /* setup badvaddr, context and entryhi registers for the guest */
         kvm_write_c0_guest_badvaddr(cop0, vcpu->arch.host_cp0_badvaddr);
@@@ -1962,7 -1946,7 +1946,7 @@@ enum emulation_result kvm_mips_emulate_
         }
   
         kvm_change_c0_guest_cause(cop0, (0xff),
-                                 (T_TLB_ST_MISS << CAUSEB_EXCCODE));
+                                 (EXCCODE_TLBS << CAUSEB_EXCCODE));
   
         /* setup badvaddr, context and entryhi registers for the guest */
         kvm_write_c0_guest_badvaddr(cop0, vcpu->arch.host_cp0_badvaddr);
@@@ -2033,7 -2017,8 +2017,8 @@@ enum emulation_result kvm_mips_emulate_
                 arch->pc = KVM_GUEST_KSEG0 + 0x180;
         }
   
-       kvm_change_c0_guest_cause(cop0, (0xff), (T_TLB_MOD << CAUSEB_EXCCODE));
+       kvm_change_c0_guest_cause(cop0, (0xff),
+                                 (EXCCODE_MOD << CAUSEB_EXCCODE));
   
         /* setup badvaddr, context and entryhi registers for the guest */
         kvm_write_c0_guest_badvaddr(cop0, vcpu->arch.host_cp0_badvaddr);
@@@ -2068,7 -2053,7 +2053,7 @@@ enum emulation_result kvm_mips_emulate_
         arch->pc = KVM_GUEST_KSEG0 + 0x180;
   
         kvm_change_c0_guest_cause(cop0, (0xff),
-                                 (T_COP_UNUSABLE << CAUSEB_EXCCODE));
+                                 (EXCCODE_CPU << CAUSEB_EXCCODE));
         kvm_change_c0_guest_cause(cop0, (CAUSEF_CE), (0x1 << CAUSEB_CE));
   
         return EMULATE_DONE;
@@@ -2096,7 -2081,7 +2081,7 @@@ enum emulation_result kvm_mips_emulate_
                 kvm_debug("Delivering RI @ pc %#lx\n", arch->pc);
   
                 kvm_change_c0_guest_cause(cop0, (0xff),
-                                         (T_RES_INST << CAUSEB_EXCCODE));
+                                         (EXCCODE_RI << CAUSEB_EXCCODE));
   
                 /* Set PC to the exception entry point */
                 arch->pc = KVM_GUEST_KSEG0 + 0x180;
@@@ -2131,7 -2116,7 +2116,7 @@@ enum emulation_result kvm_mips_emulate_
                 kvm_debug("Delivering BP @ pc %#lx\n", arch->pc);
   
                 kvm_change_c0_guest_cause(cop0, (0xff),
-                                         (T_BREAK << CAUSEB_EXCCODE));
+                                         (EXCCODE_BP << CAUSEB_EXCCODE));
   
                 /* Set PC to the exception entry point */
                 arch->pc = KVM_GUEST_KSEG0 + 0x180;
@@@ -2166,7 -2151,7 +2151,7 @@@ enum emulation_result kvm_mips_emulate_
                 kvm_debug("Delivering TRAP @ pc %#lx\n", arch->pc);
   
                 kvm_change_c0_guest_cause(cop0, (0xff),
-                                         (T_TRAP << CAUSEB_EXCCODE));
+                                         (EXCCODE_TR << CAUSEB_EXCCODE));
   
                 /* Set PC to the exception entry point */
                 arch->pc = KVM_GUEST_KSEG0 + 0x180;
@@@ -2201,7 -2186,7 +2186,7 @@@ enum emulation_result kvm_mips_emulate_
                 kvm_debug("Delivering MSAFPE @ pc %#lx\n", arch->pc);
   
                 kvm_change_c0_guest_cause(cop0, (0xff),
-                                         (T_MSAFPE << CAUSEB_EXCCODE));
+                                         (EXCCODE_MSAFPE << CAUSEB_EXCCODE));
   
                 /* Set PC to the exception entry point */
                 arch->pc = KVM_GUEST_KSEG0 + 0x180;
@@@ -2236,7 -2221,7 +2221,7 @@@ enum emulation_result kvm_mips_emulate_
                 kvm_debug("Delivering FPE @ pc %#lx\n", arch->pc);
   
                 kvm_change_c0_guest_cause(cop0, (0xff),
-                                         (T_FPE << CAUSEB_EXCCODE));
+                                         (EXCCODE_FPE << CAUSEB_EXCCODE));
   
                 /* Set PC to the exception entry point */
                 arch->pc = KVM_GUEST_KSEG0 + 0x180;
@@@ -2271,7 -2256,7 +2256,7 @@@ enum emulation_result kvm_mips_emulate_
                 kvm_debug("Delivering MSADIS @ pc %#lx\n", arch->pc);
   
                 kvm_change_c0_guest_cause(cop0, (0xff),
-                                         (T_MSADIS << CAUSEB_EXCCODE));
+                                         (EXCCODE_MSADIS << CAUSEB_EXCCODE));
   
                 /* Set PC to the exception entry point */
                 arch->pc = KVM_GUEST_KSEG0 + 0x180;
@@@ -2480,25 -2465,25 +2465,25 @@@ enum emulation_result kvm_mips_check_pr
   
         if (usermode) {
                 switch (exccode) {
-               case T_INT:
-               case T_SYSCALL:
-               case T_BREAK:
-               case T_RES_INST:
-               case T_TRAP:
-               case T_MSAFPE:
-               case T_FPE:
-               case T_MSADIS:
+               case EXCCODE_INT:
+               case EXCCODE_SYS:
+               case EXCCODE_BP:
+               case EXCCODE_RI:
+               case EXCCODE_TR:
+               case EXCCODE_MSAFPE:
+               case EXCCODE_FPE:
+               case EXCCODE_MSADIS:
                         break;
   
-               case T_COP_UNUSABLE:
+               case EXCCODE_CPU:
                         if (((cause & CAUSEF_CE) >> CAUSEB_CE) == 0)
                                 er = EMULATE_PRIV_FAIL;
                         break;
   
-               case T_TLB_MOD:
+               case EXCCODE_MOD:
                         break;
   
-               case T_TLB_LD_MISS:
+               case EXCCODE_TLBL:
                         /*
                          * We we are accessing Guest kernel space, then send an
                          * address error exception to the guest
@@@ -2507,12 -2492,12 +2492,12 @@@
                                 kvm_debug("%s: LD MISS @ %#lx\n", __func__,
                                           badvaddr);
                                 cause &= ~0xff;
-                               cause |= (T_ADDR_ERR_LD << CAUSEB_EXCCODE);
+                               cause |= (EXCCODE_ADEL << CAUSEB_EXCCODE);
                                 er = EMULATE_PRIV_FAIL;
                         }
                         break;
   
-               case T_TLB_ST_MISS:
+               case EXCCODE_TLBS:
                         /*
                          * We we are accessing Guest kernel space, then send an
                          * address error exception to the guest
@@@ -2521,26 -2506,26 +2506,26 @@@
                                 kvm_debug("%s: ST MISS @ %#lx\n", __func__,
                                           badvaddr);
                                 cause &= ~0xff;
-                               cause |= (T_ADDR_ERR_ST << CAUSEB_EXCCODE);
+                               cause |= (EXCCODE_ADES << CAUSEB_EXCCODE);
                                 er = EMULATE_PRIV_FAIL;
                         }
                         break;
   
-               case T_ADDR_ERR_ST:
+               case EXCCODE_ADES:
                         kvm_debug("%s: address error ST @ %#lx\n", __func__,
                                   badvaddr);
                         if ((badvaddr & PAGE_MASK) == KVM_GUEST_COMMPAGE_ADDR) {
                                 cause &= ~0xff;
-                               cause |= (T_TLB_ST_MISS << CAUSEB_EXCCODE);
+                               cause |= (EXCCODE_TLBS << CAUSEB_EXCCODE);
                         }
                         er = EMULATE_PRIV_FAIL;
                         break;
-               case T_ADDR_ERR_LD:
+               case EXCCODE_ADEL:
                         kvm_debug("%s: address error LD @ %#lx\n", __func__,
                                   badvaddr);
                         if ((badvaddr & PAGE_MASK) == KVM_GUEST_COMMPAGE_ADDR) {
                                 cause &= ~0xff;
-                               cause |= (T_TLB_LD_MISS << CAUSEB_EXCCODE);
+                               cause |= (EXCCODE_TLBL << CAUSEB_EXCCODE);
                         }
                         er = EMULATE_PRIV_FAIL;
                         break;
@@@ -2583,13 -2568,12 +2568,12 @@@ enum emulation_result kvm_mips_handle_t
          * an entry into the guest TLB.
          */
         index = kvm_mips_guest_tlb_lookup(vcpu,
-                                         (va & VPN2_MASK) |
-                                         (kvm_read_c0_guest_entryhi
-                                          (vcpu->arch.cop0) & ASID_MASK));
+                     (va & VPN2_MASK) |
+                     (kvm_read_c0_guest_entryhi(vcpu->arch.cop0) & ASID_MASK));
         if (index < 0) {
-               if (exccode == T_TLB_LD_MISS) {
+               if (exccode == EXCCODE_TLBL) {
                         er = kvm_mips_emulate_tlbmiss_ld(cause, opc, run, vcpu);
-               } else if (exccode == T_TLB_ST_MISS) {
+               } else if (exccode == EXCCODE_TLBS) {
                         er = kvm_mips_emulate_tlbmiss_st(cause, opc, run, vcpu);
                 } else {
                         kvm_err("%s: invalid exc code: %d\n", __func__,
@@@ -2604,10 -2588,10 +2588,10 @@@
                  * exception to the guest
                  */
                 if (!TLB_IS_VALID(*tlb, va)) {
-                       if (exccode == T_TLB_LD_MISS) {
+                       if (exccode == EXCCODE_TLBL) {
                                 er = kvm_mips_emulate_tlbinv_ld(cause, opc, run,
                                                                 vcpu);
-                       } else if (exccode == T_TLB_ST_MISS) {
+                       } else if (exccode == EXCCODE_TLBS) {
                                 er = kvm_mips_emulate_tlbinv_st(cause, opc, run,
                                                                 vcpu);
                         } else {
diff --combined arch/mips/kvm/tlb.c

index 570479c03bdc35009f48985e70d17f00686b5012,0939b1d6f91081bc5172b073dff7d4160ca4d423..a08c439462472e3a2e441c1238d62cdee2988ed7
--- 1/arch/mips/kvm/tlb.c
--- 2/arch/mips/kvm/tlb.c
+++ b/arch/mips/kvm/tlb.c
@@@ -35,17 -35,17 +35,17 @@@
   #define PRIx64 "llx"
   
   atomic_t kvm_mips_instance;
- EXPORT_SYMBOL(kvm_mips_instance);
+ EXPORT_SYMBOL_GPL(kvm_mips_instance);
   
   /* These function pointers are initialized once the KVM module is loaded */
- -pfn_t (*kvm_mips_gfn_to_pfn)(struct kvm *kvm, gfn_t gfn);
+ +kvm_pfn_t (*kvm_mips_gfn_to_pfn)(struct kvm *kvm, gfn_t gfn);
- EXPORT_SYMBOL(kvm_mips_gfn_to_pfn);
+ EXPORT_SYMBOL_GPL(kvm_mips_gfn_to_pfn);
   
- -void (*kvm_mips_release_pfn_clean)(pfn_t pfn);
+ +void (*kvm_mips_release_pfn_clean)(kvm_pfn_t pfn);
- EXPORT_SYMBOL(kvm_mips_release_pfn_clean);
+ EXPORT_SYMBOL_GPL(kvm_mips_release_pfn_clean);
   
- -bool (*kvm_mips_is_error_pfn)(pfn_t pfn);
+ +bool (*kvm_mips_is_error_pfn)(kvm_pfn_t pfn);
- EXPORT_SYMBOL(kvm_mips_is_error_pfn);
+ EXPORT_SYMBOL_GPL(kvm_mips_is_error_pfn);
   
   uint32_t kvm_mips_get_kernel_asid(struct kvm_vcpu *vcpu)
   {
@@@ -111,7 -111,7 +111,7 @@@ void kvm_mips_dump_host_tlbs(void
         mtc0_tlbw_hazard();
         local_irq_restore(flags);
   }
- EXPORT_SYMBOL(kvm_mips_dump_host_tlbs);
+ EXPORT_SYMBOL_GPL(kvm_mips_dump_host_tlbs);
   
   void kvm_mips_dump_guest_tlbs(struct kvm_vcpu *vcpu)
   {
@@@ -139,12 -139,12 +139,12 @@@
                          (tlb.tlb_lo1 >> 3) & 7, tlb.tlb_mask);
         }
   }
- EXPORT_SYMBOL(kvm_mips_dump_guest_tlbs);
+ EXPORT_SYMBOL_GPL(kvm_mips_dump_guest_tlbs);
   
   static int kvm_mips_map_page(struct kvm *kvm, gfn_t gfn)
   {
         int srcu_idx, err = 0;
- -      pfn_t pfn;
+ +      kvm_pfn_t pfn;
   
         if (kvm->arch.guest_pmap[gfn] != KVM_INVALID_PAGE)
                 return 0;
@@@ -191,7 -191,7 +191,7 @@@ unsigned long kvm_mips_translate_guest_
   
         return (kvm->arch.guest_pmap[gfn] << PAGE_SHIFT) + offset;
   }
- EXPORT_SYMBOL(kvm_mips_translate_guest_kseg0_to_hpa);
+ EXPORT_SYMBOL_GPL(kvm_mips_translate_guest_kseg0_to_hpa);
   
   /* XXXKYMA: Must be called with interrupts disabled */
   /* set flush_dcache_mask == 0 if no dcache flush required */
@@@ -262,7 -262,7 +262,7 @@@ int kvm_mips_handle_kseg0_tlb_fault(uns
                                     struct kvm_vcpu *vcpu)
   {
         gfn_t gfn;
- -      pfn_t pfn0, pfn1;
+ +      kvm_pfn_t pfn0, pfn1;
         unsigned long vaddr = 0;
         unsigned long entryhi = 0, entrylo0 = 0, entrylo1 = 0;
         int even;
@@@ -308,12 -308,12 +308,12 @@@
         return kvm_mips_host_tlb_write(vcpu, entryhi, entrylo0, entrylo1,
                                        flush_dcache_mask);
   }
- EXPORT_SYMBOL(kvm_mips_handle_kseg0_tlb_fault);
+ EXPORT_SYMBOL_GPL(kvm_mips_handle_kseg0_tlb_fault);
   
   int kvm_mips_handle_commpage_tlb_fault(unsigned long badvaddr,
         struct kvm_vcpu *vcpu)
   {
- -      pfn_t pfn0, pfn1;
+ +      kvm_pfn_t pfn0, pfn1;
         unsigned long flags, old_entryhi = 0, vaddr = 0;
         unsigned long entrylo0 = 0, entrylo1 = 0;
   
@@@ -351,7 -351,7 +351,7 @@@
   
         return 0;
   }
- EXPORT_SYMBOL(kvm_mips_handle_commpage_tlb_fault);
+ EXPORT_SYMBOL_GPL(kvm_mips_handle_commpage_tlb_fault);
   
   int kvm_mips_handle_mapped_seg_tlb_fault(struct kvm_vcpu *vcpu,
                                          struct kvm_mips_tlb *tlb,
@@@ -360,7 -360,7 +360,7 @@@
   {
         unsigned long entryhi = 0, entrylo0 = 0, entrylo1 = 0;
         struct kvm *kvm = vcpu->kvm;
- -      pfn_t pfn0, pfn1;
+ +      kvm_pfn_t pfn0, pfn1;
   
         if ((tlb->tlb_hi & VPN2_MASK) == 0) {
                 pfn0 = 0;
@@@ -401,7 -401,7 +401,7 @@@
         return kvm_mips_host_tlb_write(vcpu, entryhi, entrylo0, entrylo1,
                                        tlb->tlb_mask);
   }
- EXPORT_SYMBOL(kvm_mips_handle_mapped_seg_tlb_fault);
+ EXPORT_SYMBOL_GPL(kvm_mips_handle_mapped_seg_tlb_fault);
   
   int kvm_mips_guest_tlb_lookup(struct kvm_vcpu *vcpu, unsigned long entryhi)
   {
@@@ -422,7 -422,7 +422,7 @@@
   
         return index;
   }
- EXPORT_SYMBOL(kvm_mips_guest_tlb_lookup);
+ EXPORT_SYMBOL_GPL(kvm_mips_guest_tlb_lookup);
   
   int kvm_mips_host_tlb_lookup(struct kvm_vcpu *vcpu, unsigned long vaddr)
   {
@@@ -458,7 -458,7 +458,7 @@@
   
         return idx;
   }
- EXPORT_SYMBOL(kvm_mips_host_tlb_lookup);
+ EXPORT_SYMBOL_GPL(kvm_mips_host_tlb_lookup);
   
   int kvm_mips_host_tlb_inv(struct kvm_vcpu *vcpu, unsigned long va)
   {
@@@ -505,44 -505,7 +505,7 @@@
   
         return 0;
   }
- EXPORT_SYMBOL(kvm_mips_host_tlb_inv);
- 
- /* XXXKYMA: Fix Guest USER/KERNEL no longer share the same ASID */
- int kvm_mips_host_tlb_inv_index(struct kvm_vcpu *vcpu, int index)
- {
-       unsigned long flags, old_entryhi;
- 
-       if (index >= current_cpu_data.tlbsize)
-               BUG();
- 
-       local_irq_save(flags);
- 
-       old_entryhi = read_c0_entryhi();
- 
-       write_c0_entryhi(UNIQUE_ENTRYHI(index));
-       mtc0_tlbw_hazard();
- 
-       write_c0_index(index);
-       mtc0_tlbw_hazard();
- 
-       write_c0_entrylo0(0);
-       mtc0_tlbw_hazard();
- 
-       write_c0_entrylo1(0);
-       mtc0_tlbw_hazard();
- 
-       tlb_write_indexed();
-       mtc0_tlbw_hazard();
-       tlbw_use_hazard();
- 
-       write_c0_entryhi(old_entryhi);
-       mtc0_tlbw_hazard();
-       tlbw_use_hazard();
- 
-       local_irq_restore(flags);
- 
-       return 0;
- }
+ EXPORT_SYMBOL_GPL(kvm_mips_host_tlb_inv);
   
   void kvm_mips_flush_host_tlb(int skip_kseg0)
   {
@@@ -594,7 -557,7 +557,7 @@@
   
         local_irq_restore(flags);
   }
- EXPORT_SYMBOL(kvm_mips_flush_host_tlb);
+ EXPORT_SYMBOL_GPL(kvm_mips_flush_host_tlb);
   
   void kvm_get_new_mmu_context(struct mm_struct *mm, unsigned long cpu,
                              struct kvm_vcpu *vcpu)
@@@ -642,7 -605,7 +605,7 @@@ void kvm_local_flush_tlb_all(void
   
         local_irq_restore(flags);
   }
- EXPORT_SYMBOL(kvm_local_flush_tlb_all);
+ EXPORT_SYMBOL_GPL(kvm_local_flush_tlb_all);
   
   /**
    * kvm_mips_migrate_count() - Migrate timer.
@@@ -673,8 -636,8 +636,8 @@@ void kvm_arch_vcpu_load(struct kvm_vcp
   
         local_irq_save(flags);
   
-       if (((vcpu->arch.
-             guest_kernel_asid[cpu] ^ asid_cache(cpu)) & ASID_VERSION_MASK)) {
+       if ((vcpu->arch.guest_kernel_asid[cpu] ^ asid_cache(cpu)) &
+                                                       ASID_VERSION_MASK) {
                 kvm_get_new_mmu_context(&vcpu->arch.guest_kernel_mm, cpu, vcpu);
                 vcpu->arch.guest_kernel_asid[cpu] =
                     vcpu->arch.guest_kernel_mm.context.asid[cpu];
@@@ -739,7 -702,7 +702,7 @@@
         local_irq_restore(flags);
   
   }
- EXPORT_SYMBOL(kvm_arch_vcpu_load);
+ EXPORT_SYMBOL_GPL(kvm_arch_vcpu_load);
   
   /* ASID can change if another task is scheduled during preemption */
   void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)
@@@ -768,7 -731,7 +731,7 @@@
   
         local_irq_restore(flags);
   }
- EXPORT_SYMBOL(kvm_arch_vcpu_put);
+ EXPORT_SYMBOL_GPL(kvm_arch_vcpu_put);
   
   uint32_t kvm_get_inst(uint32_t *opc, struct kvm_vcpu *vcpu)
   {
@@@ -813,4 -776,4 +776,4 @@@
   
         return inst;
   }
- EXPORT_SYMBOL(kvm_get_inst);
+ EXPORT_SYMBOL_GPL(kvm_get_inst);
diff --combined arch/mips/mm/tlbex.c

index 482192cc8f2b88ae89f4cf1495c0dd6055a5bda6,29f73e00253d94fbd298ff2516fca23d17edddda..5a04b6f5c6fb8a2cc52d986f59042ad8cd585850
--- 1/arch/mips/mm/tlbex.c
--- 2/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@@ -240,8 -240,9 +240,8 @@@ static void output_pgtable_bits_defines
         pr_define("_PAGE_MODIFIED_SHIFT %d\n", _PAGE_MODIFIED_SHIFT);
   #ifdef CONFIG_MIPS_HUGE_TLB_SUPPORT
         pr_define("_PAGE_HUGE_SHIFT %d\n", _PAGE_HUGE_SHIFT);
- -      pr_define("_PAGE_SPLITTING_SHIFT %d\n", _PAGE_SPLITTING_SHIFT);
   #endif
- #ifdef CONFIG_CPU_MIPSR2
+ #if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6)
         if (cpu_has_rixi) {
   #ifdef _PAGE_NO_EXEC_SHIFT
                 pr_define("_PAGE_NO_EXEC_SHIFT %d\n", _PAGE_NO_EXEC_SHIFT);
diff --combined drivers/irqchip/Kconfig

index 11fc2a27fa2ea90da2b65ef282a5db139c594c71,d5bafdd5f01fdf7f252262468f24acedbc74a670..715923d5236cc9a3cb721d2f91508e420d64ff47
--- 1/drivers/irqchip/Kconfig
--- 2/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@@ -8,11 -8,6 +8,11 @@@ config ARM_GI
         select IRQ_DOMAIN_HIERARCHY
         select MULTI_IRQ_HANDLER
   
+ +config ARM_GIC_MAX_NR
+ +      int
+ +      default 2 if ARCH_REALVIEW
+ +      default 1
+ +
   config ARM_GIC_V2M
         bool
         depends on ARM_GIC
@@@ -32,14 -27,6 +32,14 @@@ config ARM_GIC_V3_IT
         bool
         select PCI_MSI_IRQ_DOMAIN
   
+ +config HISILICON_IRQ_MBIGEN
+ +      bool "Support mbigen interrupt controller"
+ +      default n
+ +      depends on ARM_GIC_V3 && ARM_GIC_V3_ITS && GENERIC_MSI_IRQ_DOMAIN
+ +      help
+ +       Enable the mbigen interrupt controller used on
+ +       Hisilicon platform.
+ +
   config ARM_NVIC
         bool
         select IRQ_DOMAIN
@@@ -130,6 -117,11 +130,11 @@@ config ORION_IRQCHI
         select IRQ_DOMAIN
         select MULTI_IRQ_HANDLER
   
+ config PIC32_EVIC
+       bool
+       select GENERIC_IRQ_CHIP
+       select IRQ_DOMAIN
+ 
   config RENESAS_INTC_IRQPIN
         bool
         select IRQ_DOMAIN
@@@ -151,12 -143,6 +156,12 @@@ config TB10X_IRQ
         select IRQ_DOMAIN
         select GENERIC_IRQ_CHIP
   
+ +config TS4800_IRQ
+ +      tristate "TS-4800 IRQ controller"
+ +      select IRQ_DOMAIN
+ +      help
+ +        Support for the TS-4800 FPGA IRQ controller
+ +
   config VERSATILE_FPGA_IRQ
         bool
         select IRQ_DOMAIN
diff --combined drivers/irqchip/Makefile

index d4c2e4ebc30809fcb21b9f705f416e9c8dbb7ee3,5278893ffb4e1496ed1e308bd86f762858d1b79c..18caacb60d581e953407ac6cae347c97bf7c4ce7
--- 1/drivers/irqchip/Makefile
--- 2/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@@ -21,11 -21,9 +21,11 @@@ obj-$(CONFIG_ARCH_SUNXI)            += irq-sun4i.
   obj-$(CONFIG_ARCH_SUNXI)              += irq-sunxi-nmi.o
   obj-$(CONFIG_ARCH_SPEAR3XX)           += spear-shirq.o
   obj-$(CONFIG_ARM_GIC)                 += irq-gic.o irq-gic-common.o
+ +obj-$(CONFIG_REALVIEW_DT)             += irq-gic-realview.o
   obj-$(CONFIG_ARM_GIC_V2M)             += irq-gic-v2m.o
   obj-$(CONFIG_ARM_GIC_V3)              += irq-gic-v3.o irq-gic-common.o
   obj-$(CONFIG_ARM_GIC_V3_ITS)          += irq-gic-v3-its.o irq-gic-v3-its-pci-msi.o irq-gic-v3-its-platform-msi.o
+ +obj-$(CONFIG_HISILICON_IRQ_MBIGEN)    += irq-mbigen.o
   obj-$(CONFIG_ARM_NVIC)                        += irq-nvic.o
   obj-$(CONFIG_ARM_VIC)                 += irq-vic.o
   obj-$(CONFIG_ATMEL_AIC_IRQ)           += irq-atmel-aic-common.o irq-atmel-aic.o
@@@ -41,7 -39,6 +41,7 @@@ obj-$(CONFIG_ARCH_NSPIRE)             += irq-zevio
   obj-$(CONFIG_ARCH_VT8500)             += irq-vt8500.o
   obj-$(CONFIG_ST_IRQCHIP)              += irq-st.o
   obj-$(CONFIG_TB10X_IRQC)              += irq-tb10x.o
+ +obj-$(CONFIG_TS4800_IRQ)              += irq-ts4800.o
   obj-$(CONFIG_XTENSA)                  += irq-xtensa-pic.o
   obj-$(CONFIG_XTENSA_MX)                       += irq-xtensa-mx.o
   obj-$(CONFIG_IRQ_CROSSBAR)            += irq-crossbar.o
@@@ -58,3 -55,4 +58,4 @@@ obj-$(CONFIG_RENESAS_H8S_INTC)                += irq-
   obj-$(CONFIG_ARCH_SA1100)             += irq-sa11x0.o
   obj-$(CONFIG_INGENIC_IRQ)             += irq-ingenic.o
   obj-$(CONFIG_IMX_GPCV2)                       += irq-imx-gpcv2.o
+ obj-$(CONFIG_PIC32_EVIC)              += irq-pic32-evic.o
diff --combined drivers/mtd/bcm63xxpart.c

index 44093699859321ce4164ed63d368ec8b72c5d49b,0aa66c378c9f93c14f6e794394cd0a9b39c2cf37..cec3188a170d6a504aad659c45cdd9613002c394
--- 1/drivers/mtd/bcm63xxpart.c
--- 2/drivers/mtd/bcm63xxpart.c
+++ b/drivers/mtd/bcm63xxpart.c
@@@ -24,6 -24,7 +24,7 @@@
   
   #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
   
+ #include <linux/bcm963xx_tag.h>
   #include <linux/crc32.h>
   #include <linux/module.h>
   #include <linux/kernel.h>
@@@ -34,11 -35,8 +35,8 @@@
   #include <linux/mtd/partitions.h>
   
   #include <asm/mach-bcm63xx/bcm63xx_nvram.h>
- #include <asm/mach-bcm63xx/bcm963xx_tag.h>
   #include <asm/mach-bcm63xx/board_bcm963xx.h>
   
- #define BCM63XX_EXTENDED_SIZE 0xBFC00000      /* Extended flash address */
- 
   #define BCM63XX_CFE_BLOCK_SIZE        SZ_64K          /* always at least 64KiB */
   
   #define BCM63XX_CFE_MAGIC_OFFSET 0x4e0
@@@ -68,7 -66,7 +66,7 @@@ static int bcm63xx_detect_cfe(struct mt
   }
   
   static int bcm63xx_parse_cfe_partitions(struct mtd_info *master,
- -                                      struct mtd_partition **pparts,
+ +                                      const struct mtd_partition **pparts,
                                         struct mtd_part_parser_data *data)
   {
         /* CFE, NVRAM and global Linux are always present */
@@@ -123,8 -121,8 +121,8 @@@
                 pr_info("CFE boot tag found with version %s and board type %s\n",
                         tagversion, boardid);
   
-               kerneladdr = kerneladdr - BCM63XX_EXTENDED_SIZE;
-               rootfsaddr = rootfsaddr - BCM63XX_EXTENDED_SIZE;
+               kerneladdr = kerneladdr - BCM963XX_EXTENDED_SIZE;
+               rootfsaddr = rootfsaddr - BCM963XX_EXTENDED_SIZE;
                 spareaddr = roundup(totallen, master->erasesize) + cfelen;
   
                 if (rootfsaddr < kerneladdr) {
@@@ -214,10 -212,24 +212,10 @@@
   };
   
   static struct mtd_part_parser bcm63xx_cfe_parser = {
- -      .owner = THIS_MODULE,
         .parse_fn = bcm63xx_parse_cfe_partitions,
         .name = "bcm63xxpart",
   };
- -
- -static int __init bcm63xx_cfe_parser_init(void)
- -{
- -      register_mtd_parser(&bcm63xx_cfe_parser);
- -      return 0;
- -}
- -
- -static void __exit bcm63xx_cfe_parser_exit(void)
- -{
- -      deregister_mtd_parser(&bcm63xx_cfe_parser);
- -}
- -
- -module_init(bcm63xx_cfe_parser_init);
- -module_exit(bcm63xx_cfe_parser_exit);
+ +module_mtd_part_parser(bcm63xx_cfe_parser);
   
   MODULE_LICENSE("GPL");
   MODULE_AUTHOR("Daniel Dickinson <openwrt@cshore.neomailbox.net>");
author	Linus Torvalds <torvalds@linux-foundation.org>
	Sun, 24 Jan 2016 20:50:56 +0000 (12:50 -0800)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Sun, 24 Jan 2016 20:50:56 +0000 (12:50 -0800)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/mips/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/mips/boot/dts/brcm/bcm6328.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history
arch/mips/include/asm/kvm_host.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/mips/include/asm/pgtable.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/mips/kvm/emulate.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/mips/kvm/tlb.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/mips/mm/tlbex.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/irqchip/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/irqchip/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mtd/bcm63xxpart.c	patch \|	diff1 \|	diff2 \|	blob \| history