Merge branches 'pm-cpuidle', 'pm-cpufreq' and 'pm-sleep'

* pm-cpuidle:
  doc: trace: fix reference to cpuidle documentation file
  cpuidle / Documentation: Update cpuidle MAINTAINERS entry

* pm-cpufreq:
  cpufreq: scmi: Fix frequency invariance in slow path
  cpufreq: check if policy is inactive early in __cpufreq_get()
  cpufreq: scpi/scmi: Fix freeing of dynamic OPPs
  cpufreq / Documentation: Update cpufreq MAINTAINERS entry

* pm-sleep:
  PM: sleep: call devfreq suspend/resume

diff --combined MAINTAINERS
index 32d444476a90056e8e644b5e56edcd502575a14c,5cc9e96ff2c34bba8f5995f67143a951a43e8f84,2a01d1af1e261207a50344ab911d74fb7099e0fb,7808b166fdb95885a12074425053df32f3476266..f6fc1b9dc00b041ba746e644f4340a7d33bdb2a5
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
--- 4/MAINTAINERS
+++ b/MAINTAINERS
@@@@@ -140,7 -140,7 -140,7 -140,7 +140,7 @@@@@ Maintainers List (try to look for most 
    M:  Steffen Klassert <[email protected]>
    L:  [email protected]
    S:  Odd Fixes
 ---F:  Documentation/networking/vortex.txt
 +++F:  Documentation/networking/device_drivers/3com/vortex.txt
    F:  drivers/net/ethernet/3com/3c59x.c
    
    3CR990 NETWORK DRIVER
@@@@@ -740,7 -740,7 -740,7 -740,7 +740,7 @@@@@ R:       Saeed Bishara <[email protected]
    R:  Zorik Machulsky <[email protected]>
    L:  [email protected]
    S:  Supported
 ---F:  Documentation/networking/ena.txt
 +++F:  Documentation/networking/device_drivers/amazon/ena.txt
    F:  drivers/net/ethernet/amazon/
    
    AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER
@@@@@ -846,14 -846,6 -846,6 -846,6 +846,14 @@@@@ S:     Supporte
    F:  drivers/iio/dac/ad5758.c
    F:  Documentation/devicetree/bindings/iio/dac/ad5758.txt
    
 +++ANALOG DEVICES INC AD7124 DRIVER
 +++M:  Stefan Popa <[email protected]>
 +++L:  [email protected]
 +++W:  http://ez.analog.com/community/linux-device-drivers
 +++S:  Supported
 +++F:  drivers/iio/adc/ad7124.c
 +++F:  Documentation/devicetree/bindings/iio/adc/adi,ad7124.txt
 +++
    ANALOG DEVICES INC AD9389B DRIVER
    M:  Hans Verkuil <[email protected]>
    L:  [email protected]
@@@@@ -958,7 -950,6 -950,6 -950,6 +958,7 @@@@@ M:       Arve Hjønnevåg <[email protected]
    M:  Todd Kjos <[email protected]>
    M:  Martijn Coenen <[email protected]>
    M:  Joel Fernandes <[email protected]>
 +++M:  Christian Brauner <[email protected]>
    T:  git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
    L:  [email protected]
    S:  Supported
@@@@@ -1306,6 -1297,7 -1297,7 -1297,7 +1306,6 @@@@@ F:  include/dt-bindings/clock/gxbb
    F:  Documentation/devicetree/bindings/clock/amlogic*
    
    ARM/Amlogic Meson SoC support
 ---M:  Carlo Caione <[email protected]>
    M:  Kevin Hilman <[email protected]>
    L:  [email protected] (moderated for non-subscribers)
    L:  [email protected]
@@@@@ -1316,7 -1308,6 -1308,6 -1308,6 +1316,7 @@@@@ F:  arch/arm/boot/dts/meson
    F:  arch/arm64/boot/dts/amlogic/
    F:  drivers/pinctrl/meson/
    F:  drivers/mmc/host/meson*
 +++F:  drivers/soc/amlogic/
    N:  meson
    
    ARM/Amlogic Meson SoC Sound Drivers
@@@@@ -1443,7 -1434,6 -1434,6 -1434,6 +1443,7 @@@@@ F:  arch/arm/mach-ep93xx/micro9.
    
    ARM/CORESIGHT FRAMEWORK AND DRIVERS
    M:  Mathieu Poirier <[email protected]>
 +++R:  Suzuki K Poulose <[email protected]>
    L:  [email protected] (moderated for non-subscribers)
    S:  Maintained
    F:  drivers/hwtracing/coresight/*
@@@@@ -1540,7 -1530,6 -1530,6 -1530,6 +1540,7 @@@@@ F:  arch/arm/mach-imx
    F:  arch/arm/mach-mxs/
    F:  arch/arm/boot/dts/imx*
    F:  arch/arm/configs/imx*_defconfig
 +++F:  arch/arm64/boot/dts/freescale/imx*
    F:  drivers/clk/imx/
    F:  drivers/firmware/imx/
    F:  drivers/soc/imx/
@@@@@ -1968,20 -1957,6 -1957,6 -1957,6 +1968,20 @@@@@ M:        Lennert Buytenhek <kernel@wantstofly
    L:  [email protected] (moderated for non-subscribers)
    S:  Maintained
    
 +++ARM/RDA MICRO ARCHITECTURE
 +++M:  Manivannan Sadhasivam <[email protected]>
 +++L:  [email protected] (moderated for non-subscribers)
 +++L:  [email protected] (moderated for non-subscribers)
 +++S:  Maintained
 +++F:  arch/arm/boot/dts/rda8810pl-*
 +++F:  drivers/clocksource/timer-rda.c
 +++F:  drivers/irqchip/irq-rda-intc.c
 +++F:  drivers/tty/serial/rda-uart.c
 +++F:  Documentation/devicetree/bindings/arm/rda.txt
 +++F:  Documentation/devicetree/bindings/interrupt-controller/rda,8810pl-intc.txt
 +++F:  Documentation/devicetree/bindings/serial/rda,8810pl-uart.txt
 +++F:  Documentation/devicetree/bindings/timer/rda,8810pl-timer.txt
 +++
    ARM/REALTEK ARCHITECTURE
    M:  Andreas Färber <[email protected]>
    L:  [email protected] (moderated for non-subscribers)
@@@@@ -2240,7 -2215,6 -2215,6 -2215,6 +2240,7 @@@@@ S:  Supporte
    F:  Documentation/devicetree/bindings/arm/ti/k3.txt
    F:  arch/arm64/boot/dts/ti/Makefile
    F:  arch/arm64/boot/dts/ti/k3-*
 +++F:  include/dt-bindings/pinctrl/k3.h
    
    ARM/TEXAS INSTRUMENT KEYSTONE ARCHITECTURE
    M:  Santosh Shilimkar <[email protected]>
@@@@@ -2284,7 -2258,6 -2258,6 -2258,6 +2284,7 @@@@@ M:  Masahiro Yamada <yamada.masahiro@soc
    L:  [email protected] (moderated for non-subscribers)
    T:  git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git
    S:  Maintained
 +++F:  Documentation/devicetree/bindings/arm/socionext/uniphier.txt
    F:  Documentation/devicetree/bindings/gpio/gpio-uniphier.txt
    F:  Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.txt
    F:  arch/arm/boot/dts/uniphier*
@@@@@ -2294,7 -2267,6 -2267,6 -2267,6 +2294,7 @@@@@ F:  arch/arm/mm/cache-uniphier.
    F:  arch/arm64/boot/dts/socionext/uniphier*
    F:  drivers/bus/uniphier-system-bus.c
    F:  drivers/clk/uniphier/
 +++F:  drivers/dmaengine/uniphier-mdmac.c
    F:  drivers/gpio/gpio-uniphier.c
    F:  drivers/i2c/busses/i2c-uniphier*
    F:  drivers/irqchip/irq-uniphier-aidet.c
@@@@@ -2381,7 -2353,7 -2353,7 -2353,7 +2381,7 @@@@@ F:  drivers/pinctrl/zte
    F:  drivers/soc/zte/
    F:  drivers/thermal/zx2967_thermal.c
    F:  drivers/watchdog/zx2967_wdt.c
 ---F:  Documentation/devicetree/bindings/arm/zte.txt
 +++F:  Documentation/devicetree/bindings/arm/zte.yaml
    F:  Documentation/devicetree/bindings/clock/zx2967*.txt
    F:  Documentation/devicetree/bindings/dma/zxdma.txt
    F:  Documentation/devicetree/bindings/gpio/zx296702-gpio.txt
@@@@@ -3512,7 -3484,6 -3484,6 -3484,6 +3512,7 @@@@@ F:  include/linux/spi/cc2520.
    F:  Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
    
    CCREE ARM TRUSTZONE CRYPTOCELL REE DRIVER
 +++M:  Yael Chemla <[email protected]>
    M:  Gilad Ben-Yossef <[email protected]>
    L:  [email protected]
    S:  Supported
@@@@@ -3674,20 -3645,11 -3645,11 -3645,11 +3674,20 @@@@@ F:     drivers/input/touchscreen/chipone_ic
    
    CHROME HARDWARE PLATFORM SUPPORT
    M:  Benson Leung <[email protected]>
 ---M:  Olof Johansson <[email protected]>
 +++M:  Enric Balletbo i Serra <[email protected]>
    S:  Maintained
    T:  git git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform.git
    F:  drivers/platform/chrome/
    
 +++CHROMEOS EC SUBDRIVERS
 +++M:  Benson Leung <[email protected]>
 +++M:  Enric Balletbo i Serra <[email protected]>
 +++R:  Guenter Roeck <[email protected]>
 +++S:  Maintained
 +++N:  cros_ec
 +++N:  cros-ec
 +++F:  drivers/power/supply/cros_usbpd-charger.c
 +++
    CIRRUS LOGIC AUDIO CODEC DRIVERS
    M:  Brian Austin <[email protected]>
    M:  Paul Handrigan <[email protected]>
@@@@@ -3725,8 -3687,6 -3687,6 -3687,6 +3725,8 @@@@@ F:  drivers/net/ethernet/cisco/enic
    
    CISCO VIC LOW LATENCY NIC DRIVER
    M:  Christian Benvenuti <[email protected]>
 +++M:  Nelson Escobar <[email protected]>
 +++M:  Parvi Kaustubhi <[email protected]>
    S:  Supported
    F:  drivers/infiniband/hw/usnic/
    
@@@@@ -3740,10 -3700,8 -3700,8 -3700,8 +3740,10 @@@@@ W:        https://github.com/CirrusLogic/linux
    S:  Supported
    F:  Documentation/devicetree/bindings/mfd/madera.txt
    F:  Documentation/devicetree/bindings/pinctrl/cirrus,madera-pinctrl.txt
 +++F:  include/linux/irqchip/irq-madera*
    F:  include/linux/mfd/madera/*
    F:  drivers/gpio/gpio-madera*
 +++F:  drivers/irqchip/irq-madera*
    F:  drivers/mfd/madera*
    F:  drivers/mfd/cs47l*
    F:  drivers/pinctrl/cirrus/*
@@@@@ -3951,7 -3909,7 -3909,7 -3909,7 +3951,7 @@@@@ L:  [email protected]
    S:  Maintained
    F:  drivers/net/ethernet/ti/cpmac.c
    
-- -CPU FREQUENCY DRIVERS
++ +CPU FREQUENCY SCALING FRAMEWORK
    M:  "Rafael J. Wysocki" <[email protected]>
    M:  Viresh Kumar <[email protected]>
    L:  [email protected]
@@@@@ -3959,6 -3917,6 -3917,8 -3917,6 +3959,8 @@@@@ S:  Maintaine
    T:  git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
    T:  git git://git.linaro.org/people/vireshk/linux.git (For ARM Updates)
    B:  https://bugzilla.kernel.org
++ +F:  Documentation/admin-guide/pm/cpufreq.rst
++ +F:  Documentation/admin-guide/pm/intel_pstate.rst
    F:  Documentation/cpu-freq/
    F:  Documentation/devicetree/bindings/cpufreq/
    F:  drivers/cpufreq/
@@@@@ -4006,13 -3964,14 -3966,13 -3964,13 +4008,14 @@@@@ S:     Supporte
    F:  drivers/cpuidle/cpuidle-exynos.c
    F:  arch/arm/mach-exynos/pm.c
    
- --CPUIDLE DRIVERS
+ ++CPU IDLE TIME MANAGEMENT FRAMEWORK
    M:  "Rafael J. Wysocki" <[email protected]>
    M:  Daniel Lezcano <[email protected]>
    L:  [email protected]
    S:  Maintained
    T:  git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
    B:  https://bugzilla.kernel.org
+ ++F:  Documentation/admin-guide/pm/cpuidle.rst
    F:  drivers/cpuidle/*
    F:  include/linux/cpuidle.h
    
@@@@@ -4178,7 -4137,7 -4138,7 -4136,7 +4181,7 @@@@@ S:  Supporte
    F:  drivers/net/ethernet/chelsio/cxgb4vf/
    
    CXL (IBM Coherent Accelerator Processor Interface CAPI) DRIVER
 ---M:  Frederic Barrat <fbarrat@linux.vnet.ibm.com>
 +++M:  Frederic Barrat <[email protected]>
    M:  Andrew Donnellan <[email protected]>
    L:  [email protected]
    S:  Supported
@@@@@ -4190,9 -4149,9 -4150,9 -4148,9 +4193,9 @@@@@ F:  Documentation/powerpc/cxl.tx
    F:  Documentation/ABI/testing/sysfs-class-cxl
    
    CXLFLASH (IBM Coherent Accelerator Processor Interface CAPI Flash) SCSI DRIVER
 ---M:  Manoj N. Kumar <manoj@linux.vnet.ibm.com>
 ---M:  Matthew R. Ochs <mrochs@linux.vnet.ibm.com>
 ---M:  Uma Krishnan <ukrishn@linux.vnet.ibm.com>
 +++M:  Manoj N. Kumar <[email protected]>
 +++M:  Matthew R. Ochs <[email protected]>
 +++M:  Uma Krishnan <[email protected]>
    L:  [email protected]
    S:  Supported
    F:  drivers/scsi/cxlflash/
@@@@@ -4264,7 -4223,7 -4224,7 -4222,7 +4267,7 @@@@@ F:  net/ax25/sysctl_net_ax25.
    DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
    L:  [email protected]
    S:  Orphan
 ---F:  Documentation/networking/dmfe.txt
 +++F:  Documentation/networking/device_drivers/dec/dmfe.txt
    F:  drivers/net/ethernet/dec/tulip/dmfe.c
    
    DC390/AM53C974 SCSI driver
@@@@@ -5584,7 -5543,7 -5544,7 -5542,7 +5587,7 @@@@@ S:  Orpha
    F:  fs/efs/
    
    EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER
 ---M:  Douglas Miller <dougmill@linux.vnet.ibm.com>
 +++M:  Douglas Miller <[email protected]>
    L:  [email protected]
    S:  Maintained
    F:  drivers/net/ethernet/ibm/ehea/
@@@@@ -5698,7 -5657,6 -5658,6 -5656,6 +5701,7 @@@@@ F:  include/linux/of_net.
    F:  include/linux/phy.h
    F:  include/linux/phy_fixed.h
    F:  include/linux/platform_data/mdio-bcm-unimac.h
 +++F:  include/linux/platform_data/mdio-gpio.h
    F:  include/trace/events/mdio.h
    F:  include/uapi/linux/mdio.h
    F:  include/uapi/linux/mii.h
@@@@@ -5719,11 -5677,11 -5678,11 -5676,11 +5722,11 @@@@@ W:     http://ext4.wiki.kernel.or
    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/ext4.rst
 +++F:  Documentation/filesystems/ext4/
    F:  fs/ext4/
    
    Extended Verification Module (EVM)
 ---M:  Mimi Zohar <zohar@linux.vnet.ibm.com>
 +++M:  Mimi Zohar <[email protected]>
    L:  [email protected]
    S:  Supported
    F:  security/integrity/evm/
@@@@@ -5933,7 -5891,7 -5892,7 -5890,7 +5936,7 @@@@@ F:  include/linux/firmware.
    
    FLASH ADAPTER DRIVER (IBM Flash Adapter 900GB Full Height PCI Flash Card)
    M:  Joshua Morris <[email protected]>
 ---M:  Philip Kelleher <pjk1939@linux.vnet.ibm.com>
 +++M:  Philip Kelleher <[email protected]>
    S:  Maintained
    F:  drivers/block/rsxx/
    
@@@@@ -6200,7 -6158,7 -6159,7 -6157,7 +6203,7 @@@@@ F:  include/linux/fscrypt*.
    F:  Documentation/filesystems/fscrypt.rst
    
    FSI-ATTACHED I2C DRIVER
 ---M:  Eddie James <eajames@linux.vnet.ibm.com>
 +++M:  Eddie James <[email protected]>
    L:  [email protected]
    L:  [email protected] (moderated for non-subscribers)
    S:  Maintained
@@@@@ -6347,7 -6305,6 -6306,6 -6304,6 +6350,7 @@@@@ T:  git git://git.kernel.org/pub/scm/lin
    S:  Supported
    F:  drivers/phy/
    F:  include/linux/phy/
 +++F:  Documentation/devicetree/bindings/phy/
    
    GENERIC PINCTRL I2C DEMULTIPLEXER DRIVER
    M:  Wolfram Sang <[email protected]>
@@@@@ -6377,7 -6334,8 -6335,8 -6333,8 +6380,7 @@@@@ S:  Supporte
    F:  drivers/uio/uio_pci_generic.c
    
    GENWQE (IBM Generic Workqueue Card)
 ---M:  Frank Haverkamp <[email protected]>
 ---M:  Guilherme G. Piccoli <[email protected]>
 +++M:  Frank Haverkamp <[email protected]>
    S:  Supported
    F:  drivers/misc/genwqe/
    
@@@@@ -6450,6 -6408,7 -6409,7 -6407,7 +6453,6 @@@@@ F:  drivers/media/rc/gpio-ir-tx.
    
    GPIO MOCKUP DRIVER
    M:  Bamvor Jian Zhang <[email protected]>
 ---R:  Bartosz Golaszewski <[email protected]>
    L:  [email protected]
    S:  Maintained
    F:  drivers/gpio/gpio-mockup.c
@@@@@ -6943,14 -6902,6 -6903,6 -6901,6 +6946,14 @@@@@ L:        [email protected]
    S:  Maintained
    F:  drivers/input/touchscreen/htcpen.c
    
 +++HTS221 TEMPERATURE-HUMIDITY IIO DRIVER
 +++M:  Lorenzo Bianconi <[email protected]>
 +++L:  [email protected]
 +++W:  http://www.st.com/
 +++S:  Maintained
 +++F:  drivers/iio/humidity/hts221*
 +++F:  Documentation/devicetree/bindings/iio/humidity/hts221.txt
 +++
    HUAWEI ETHERNET DRIVER
    M:  Aviad Krawczyk <[email protected]>
    L:  [email protected]
@@@@@ -6998,7 -6949,7 -6950,7 -6948,7 +7001,7 @@@@@ M:  Sasha Levin <[email protected]
    T:  git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git
    L:  [email protected]
    S:  Supported
 ---F:  Documentation/networking/netvsc.txt
 +++F:  Documentation/networking/device_drivers/microsoft/netvsc.txt
    F:  arch/x86/include/asm/mshyperv.h
    F:  arch/x86/include/asm/trace/hyperv.h
    F:  arch/x86/include/asm/hyperv-tlfs.h
@@@@@ -7195,9 -7146,8 -7147,8 -7145,8 +7198,9 @@@@@ F:  crypto/842.
    F:  lib/842/
    
    IBM Power in-Nest Crypto Acceleration
 ---M:  Leonidas S. Barbosa <[email protected]>
 ---M:  Paulo Flabiano Smorigo <[email protected]>
 +++M:  Breno Leitão <[email protected]>
 +++M:  Nayna Jain <[email protected]>
 +++M:  Paulo Flabiano Smorigo <[email protected]>
    L:  [email protected]
    S:  Supported
    F:  drivers/crypto/nx/Makefile
@@@@@ -7214,8 -7164,8 -7165,8 -7163,8 +7217,8 @@@@@ S:  Supporte
    F:  drivers/scsi/ipr.*
    
    IBM Power SRIOV Virtual NIC Device Driver
 ---M:  Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
 ---M:  John Allen <jallen@linux.vnet.ibm.com>
 +++M:  Thomas Falcon <[email protected]>
 +++M:  John Allen <[email protected]>
    L:  [email protected]
    S:  Supported
    F:  drivers/net/ethernet/ibm/ibmvnic.*
@@@@@ -7230,40 -7180,41 -7181,41 -7179,41 +7233,40 @@@@@ F:     arch/powerpc/include/asm/vas.
    F:  arch/powerpc/include/uapi/asm/vas.h
    
    IBM Power Virtual Ethernet Device Driver
 ---M:  Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
 +++M:  Thomas Falcon <[email protected]>
    L:  [email protected]
    S:  Supported
    F:  drivers/net/ethernet/ibm/ibmveth.*
    
    IBM Power Virtual FC Device Drivers
 ---M:  Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
 +++M:  Tyrel Datwyler <[email protected]>
    L:  [email protected]
    S:  Supported
    F:  drivers/scsi/ibmvscsi/ibmvfc*
    
    IBM Power Virtual Management Channel Driver
 ---M:  Bryant G. Ly <[email protected]>
 ---M:  Steven Royer <[email protected]>
 +++M:  Steven Royer <[email protected]>
    S:  Supported
    F:  drivers/misc/ibmvmc.*
    
    IBM Power Virtual SCSI Device Drivers
 ---M:  Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
 +++M:  Tyrel Datwyler <[email protected]>
    L:  [email protected]
    S:  Supported
    F:  drivers/scsi/ibmvscsi/ibmvscsi*
    F:  include/scsi/viosrp.h
    
    IBM Power Virtual SCSI Device Target Driver
 ---M:  Bryant G. Ly <[email protected]>
 ---M:  Michael Cyr <[email protected]>
 +++M:  Michael Cyr <[email protected]>
    L:  [email protected]
    L:  [email protected]
    S:  Supported
    F:  drivers/scsi/ibmvscsi_tgt/
    
    IBM Power VMX Cryptographic instructions
 ---M:  Leonidas S. Barbosa <[email protected]>
 ---M:  Paulo Flabiano Smorigo <[email protected]>
 +++M:  Breno Leitão <[email protected]>
 +++M:  Nayna Jain <[email protected]>
 +++M:  Paulo Flabiano Smorigo <[email protected]>
    L:  [email protected]
    S:  Supported
    F:  drivers/crypto/vmx/Makefile
@@@@@ -7540,7 -7491,7 -7492,7 -7490,7 +7543,7 @@@@@ S:  Maintaine
    L:  [email protected]
    
    INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
 ---M:  Mimi Zohar <zohar@linux.vnet.ibm.com>
 +++M:  Mimi Zohar <[email protected]>
    M:  Dmitry Kasatkin <[email protected]>
    L:  [email protected]
    T:  git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
@@@@@ -7600,18 -7551,18 -7552,18 -7550,18 +7603,18 @@@@@ Q:     http://patchwork.ozlabs.org/project/
    T:  git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue.git
    T:  git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue.git
    S:  Supported
 ---F:  Documentation/networking/e100.rst
 ---F:  Documentation/networking/e1000.rst
 ---F:  Documentation/networking/e1000e.rst
 ---F:  Documentation/networking/fm10k.rst
 ---F:  Documentation/networking/igb.rst
 ---F:  Documentation/networking/igbvf.rst
 ---F:  Documentation/networking/ixgb.rst
 ---F:  Documentation/networking/ixgbe.rst
 ---F:  Documentation/networking/ixgbevf.rst
 ---F:  Documentation/networking/i40e.rst
 ---F:  Documentation/networking/iavf.rst
 ---F:  Documentation/networking/ice.rst
 +++F:  Documentation/networking/device_drivers/intel/e100.rst
 +++F:  Documentation/networking/device_drivers/intel/e1000.rst
 +++F:  Documentation/networking/device_drivers/intel/e1000e.rst
 +++F:  Documentation/networking/device_drivers/intel/fm10k.rst
 +++F:  Documentation/networking/device_drivers/intel/igb.rst
 +++F:  Documentation/networking/device_drivers/intel/igbvf.rst
 +++F:  Documentation/networking/device_drivers/intel/ixgb.rst
 +++F:  Documentation/networking/device_drivers/intel/ixgbe.rst
 +++F:  Documentation/networking/device_drivers/intel/ixgbevf.rst
 +++F:  Documentation/networking/device_drivers/intel/i40e.rst
 +++F:  Documentation/networking/device_drivers/intel/iavf.rst
 +++F:  Documentation/networking/device_drivers/intel/ice.rst
    F:  drivers/net/ethernet/intel/
    F:  drivers/net/ethernet/intel/*/
    F:  include/linux/avf/virtchnl.h
@@@@@ -7793,8 -7744,8 -7745,8 -7743,8 +7796,8 @@@@@ INTEL PRO/WIRELESS 2100, 2200BG, 2915AB
    M:  Stanislav Yakovlev <[email protected]>
    L:  [email protected]
    S:  Maintained
 ---F:  Documentation/networking/README.ipw2100
 ---F:  Documentation/networking/README.ipw2200
 +++F:  Documentation/networking/device_drivers/intel/ipw2100.txt
 +++F:  Documentation/networking/device_drivers/intel/ipw2200.txt
    F:  drivers/net/wireless/intel/ipw2x00/
    
    INTEL PSTATE DRIVER
@@@@@ -7899,18 -7850,6 -7851,6 -7849,6 +7902,18 @@@@@ L:        [email protected]
    S:  Maintained
    F:  drivers/tty/serial/ioc3_serial.c
    
 +++IOMAP FILESYSTEM LIBRARY
 +++M:  Christoph Hellwig <[email protected]>
 +++M:  Darrick J. Wong <[email protected]>
 +++M:  [email protected]
 +++M:  [email protected]
 +++L:  [email protected]
 +++L:  [email protected]
 +++T:  git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
 +++S:  Supported
 +++F:  fs/iomap.c
 +++F:  include/linux/iomap.h
 +++
    IOMMU DRIVERS
    M:  Joerg Roedel <[email protected]>
    L:  [email protected]
@@@@@ -8066,6 -8005,13 -8006,13 -8004,13 +8069,6 @@@@@ F:       include/linux/isdn
    F:  include/uapi/linux/isdn.h
    F:  include/uapi/linux/isdn/
    
 ---ISDN SUBSYSTEM (Eicon active card driver)
 ---M:  Armin Schindler <[email protected]>
 ---L:  [email protected] (subscribers-only)
 ---W:  http://www.melware.de
 ---S:  Maintained
 ---F:  drivers/isdn/hardware/eicon/
 ---
    IT87 HARDWARE MONITORING DRIVER
    M:  Jean Delvare <[email protected]>
    L:  [email protected]
@@@@@ -8154,8 -8100,9 -8101,9 -8099,9 +8157,8 @@@@@ S:  Maintaine
    F:  drivers/media/platform/rcar_jpu.c
    
    JSM Neo PCI based serial card
 ---M:  Guilherme G. Piccoli <[email protected]>
    L:  [email protected]
 ---S:  Maintained
 +++S:  Orphan
    F:  drivers/tty/serial/jsm/
    
    K10TEMP HARDWARE MONITORING DRIVER
@@@@@ -8361,7 -8308,6 -8309,6 -8307,6 +8364,7 @@@@@ W:  http://www.linux-kvm.or
    T:  git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
    S:  Supported
    F:  arch/x86/kvm/
 +++F:  arch/x86/kvm/*/
    F:  arch/x86/include/uapi/asm/kvm*
    F:  arch/x86/include/asm/kvm*
    F:  arch/x86/include/asm/pvclock-abi.h
@@@@@ -8386,7 -8332,7 -8333,7 -8331,7 +8389,7 @@@@@ F:  include/uapi/linux/kexec.
    F:  kernel/kexec*
    
    KEYS-ENCRYPTED
 ---M:  Mimi Zohar <zohar@linux.vnet.ibm.com>
 +++M:  Mimi Zohar <[email protected]>
    L:  [email protected]
    L:  [email protected]
    S:  Supported
@@@@@ -8395,9 -8341,9 -8342,9 -8340,9 +8398,9 @@@@@ F:  include/keys/encrypted-type.
    F:  security/keys/encrypted-keys/
    
    KEYS-TRUSTED
 ---M:  James Bottomley <jejb@linux.vnet.ibm.com>
 +++M:  James Bottomley <[email protected]>
    M:      Jarkko Sakkinen <[email protected]>
 ---M:  Mimi Zohar <zohar@linux.vnet.ibm.com>
 +++M:  Mimi Zohar <[email protected]>
    L:  [email protected]
    L:  [email protected]
    S:  Supported
@@@@@ -8450,7 -8396,7 -8397,7 -8395,7 +8453,7 @@@@@ F:  lib/test_kmod.
    F:  tools/testing/selftests/kmod/
    
    KPROBES
 ---M:  Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
 +++M:  Naveen N. Rao <[email protected]>
    M:  Anil S Keshavamurthy <[email protected]>
    M:  "David S. Miller" <[email protected]>
    M:  Masami Hiramatsu <[email protected]>
@@@@@ -8806,7 -8752,7 -8753,7 -8751,7 +8809,7 @@@@@ M:  Nicholas Piggin <[email protected]
    M:  David Howells <[email protected]>
    M:  Jade Alglave <[email protected]>
    M:  Luc Maranget <[email protected]>
 ---M:  "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 +++M:  "Paul E. McKenney" <[email protected]>
    R:  Akira Yokosawa <[email protected]>
    R:  Daniel Lustig <[email protected]>
    L:  [email protected]
@@@@@ -9118,11 -9064,6 -9065,6 -9063,6 +9121,11 @@@@@ L:        [email protected]
    S:  Maintained
    F:  drivers/net/phy/marvell10g.c
    
 +++MARVELL MVEBU THERMAL DRIVER
 +++M:  Miquel Raynal <[email protected]>
 +++S:  Maintained
 +++F:  drivers/thermal/armada_thermal.c
 +++
    MARVELL MVNETA ETHERNET DRIVER
    M:  Thomas Petazzoni <[email protected]>
    L:  [email protected]
@@@@@ -9776,7 -9717,7 -9718,7 -9716,7 +9779,7 @@@@@ F:  drivers/platform/x86/mlx-platform.
    
    MEMBARRIER SUPPORT
    M:  Mathieu Desnoyers <[email protected]>
 ---M:  "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 +++M:  "Paul E. McKenney" <[email protected]>
    L:  [email protected]
    S:  Supported
    F:  kernel/sched/membarrier.c
@@@@@ -9951,13 -9892,6 -9893,6 -9891,6 +9954,13 @@@@@ M:        Ludovic Desroches <ludovic.desroches
    S:  Maintained
    F:  drivers/mmc/host/atmel-mci.c
    
 +++MICROCHIP MCP16502 PMIC DRIVER
 +++M:  Andrei Stefanescu <[email protected]>
 +++L:  [email protected] (moderated for non-subscribers)
 +++S:  Maintained
 +++F:  Documentation/devicetree/bindings/regulator/mcp16502-regulator.txt
 +++F:  drivers/regulator/mcp16502.c
 +++
    MICROCHIP MCP3911 ADC DRIVER
    M:  Marcus Folkesson <[email protected]>
    M:  Kent Gustavsson <[email protected]>
@@@@@ -9995,12 -9929,6 -9930,6 -9928,6 +9998,12 @@@@@ M:        Nicolas Ferre <nicolas.ferre@microch
    S:  Supported
    F:  drivers/power/reset/at91-sama5d2_shdwc.c
    
 +++MICROCHIP SAMA5D2-COMPATIBLE PIOBU GPIO
 +++M:  Andrei Stefanescu <[email protected]>
 +++L:  [email protected] (moderated for non-subscribers)
 +++L:  [email protected]
 +++F:  drivers/gpio/gpio-sama5d2-piobu.c
 +++
    MICROCHIP SPI DRIVER
    M:  Nicolas Ferre <[email protected]>
    S:  Supported
@@@@@ -10042,9 -9970,8 -9971,8 -9969,8 +10045,9 @@@@@ F:        drivers/dma/at_xdmac.
    
    MICROSEMI MIPS SOCS
    M:  Alexandre Belloni <[email protected]>
 +++M:  Microchip Linux Driver Support <[email protected]>
    L:  [email protected]
 ---S:  Maintained
 +++S:  Supported
    F:  arch/mips/generic/board-ocelot.c
    F:  arch/mips/configs/generic/board-ocelot.config
    F:  arch/mips/boot/dts/mscc/
@@@@@ -10064,7 -9991,6 -9992,6 -9990,6 +10067,7 @@@@@ F:        Documentation/scsi/smartpqi.tx
    
    MICROSEMI ETHERNET SWITCH DRIVER
    M:  Alexandre Belloni <[email protected]>
 +++M:  Microchip Linux Driver Support <[email protected]>
    L:  [email protected]
    S:  Supported
    F:  drivers/net/ethernet/mscc/
@@@@@ -10476,8 -10402,8 -10403,8 -10401,8 +10479,8 @@@@@ NETERION 10GbE DRIVERS (s2io/vxge
    M:  Jon Mason <[email protected]>
    L:  [email protected]
    S:  Supported
 ---F:  Documentation/networking/s2io.txt
 ---F:  Documentation/networking/vxge.txt
 +++F:  Documentation/networking/device_drivers/neterion/s2io.txt
 +++F:  Documentation/networking/device_drivers/neterion/vxge.txt
    F:  drivers/net/ethernet/neterion/
    
    NETFILTER
@@@@@ -10919,14 -10845,6 -10846,6 -10844,6 +10922,14 @@@@@ L:   [email protected] (moderated fo
    S:  Supported
    F:  drivers/nfc/nxp-nci
    
 +++OBJAGG
 +++M:  Jiri Pirko <[email protected]>
 +++L:  [email protected]
 +++S:  Supported
 +++F:  lib/objagg.c
 +++F:  lib/test_objagg.c
 +++F:  include/linux/objagg.h
 +++
    OBJTOOL
    M:  Josh Poimboeuf <[email protected]>
    M:  Peter Zijlstra <[email protected]>
@@@@@ -10934,7 -10852,7 -10853,7 -10851,7 +10937,7 @@@@@ S:     Supporte
    F:  tools/objtool/
    
    OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER
 ---M:  Frederic Barrat <fbarrat@linux.vnet.ibm.com>
 +++M:  Frederic Barrat <[email protected]>
    M:  Andrew Donnellan <[email protected]>
    L:  [email protected]
    S:  Supported
@@@@@ -11759,7 -11677,6 -11678,6 -11676,6 +11762,7 @@@@@ F:     include/uapi/linux/pci
    F:  lib/pci*
    F:  arch/x86/pci/
    F:  arch/x86/kernel/quirks.c
 +++F:  arch/x86/kernel/early-quirks.c
    
    PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS
    M:  Lorenzo Pieralisi <[email protected]>
@@@@@ -11769,13 -11686,6 -11687,6 -11685,6 +11772,13 @@@@@ T:   git git://git.kernel.org/pub/scm/lin
    S:  Supported
    F:  drivers/pci/controller/
    
 +++PCIE DRIVER FOR AMLOGIC MESON
 +++M:  Yue Wang <[email protected]>
 +++L:  [email protected]
 +++L:  [email protected]
 +++S:  Maintained
 +++F:  drivers/pci/controller/dwc/pci-meson.c
 +++
    PCIE DRIVER FOR AXIS ARTPEC
    M:  Jesper Nilsson <[email protected]>
    L:  [email protected]
@@@@@ -11808,6 -11718,7 -11719,7 -11717,7 +11811,6 @@@@@ F:     Documentation/devicetree/bindings/pc
    F:  drivers/pci/controller/dwc/pcie-kirin.c
    
    PCIE DRIVER FOR HISILICON STB
 ---M:  Jianguo Sun <[email protected]>
    M:  Shawn Guo <[email protected]>
    L:  [email protected]
    S:  Maintained
@@@@@ -11844,13 -11755,6 -11756,6 -11754,6 +11847,13 @@@@@ S:   Maintaine
    F:  Documentation/devicetree/bindings/pci/v3-v360epc-pci.txt
    F:  drivers/pci/controller/pci-v3-semi.c
    
 +++PCIE DRIVER FOR SOCIONEXT UNIPHIER
 +++M:  Kunihiko Hayashi <[email protected]>
 +++L:  [email protected]
 +++S:  Maintained
 +++F:  Documentation/devicetree/bindings/pci/uniphier-pcie.txt
 +++F:  drivers/pci/controller/dwc/pcie-uniphier.c
 +++
    PCIE DRIVER FOR ST SPEAR13XX
    M:  Pratyush Anand <[email protected]>
    L:  [email protected]
@@@@@ -11976,12 -11880,18 -11881,18 -11879,18 +11979,12 @@@@@ F:        Documentation/driver-api/pinctl.rs
    F:  drivers/pinctrl/
    F:  include/linux/pinctrl/
    
 ---PIN CONTROLLER - ATMEL AT91
 ---M:  Jean-Christophe Plagniol-Villard <[email protected]>
 ---L:  [email protected] (moderated for non-subscribers)
 ---S:  Maintained
 ---F:  drivers/pinctrl/pinctrl-at91.*
 ---
 ---PIN CONTROLLER - ATMEL AT91 PIO4
 +++PIN CONTROLLER - MICROCHIP AT91
    M:  Ludovic Desroches <[email protected]>
    L:  [email protected] (moderated for non-subscribers)
    L:  [email protected]
    S:  Supported
 ---F:  drivers/pinctrl/pinctrl-at91-pio4.*
 +++F:  drivers/pinctrl/pinctrl-at91*
    
    PIN CONTROLLER - FREESCALE
    M:  Dong Aisheng <[email protected]>
@@@@@ -12017,11 -11927,11 -11928,11 -11926,11 +12020,11 @@@@@ F:        Documentation/devicetree/bindings/pi
    F:  drivers/pinctrl/qcom/
    
    PIN CONTROLLER - RENESAS
 ---M:  Laurent Pinchart <[email protected]>
    M:  Geert Uytterhoeven <[email protected]>
    L:  [email protected]
    T:  git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git sh-pfc
    S:  Maintained
 +++F:  drivers/pinctrl/pinctrl-rz*
    F:  drivers/pinctrl/sh-pfc/
    
    PIN CONTROLLER - SAMSUNG
@@@@@ -12126,13 -12036,6 -12037,6 -12035,6 +12129,13 @@@@@ M:   "Rafael J. Wysocki" <rafael.j.wysock
    S:  Maintained
    F:  drivers/pnp/
    
 +++PNI RM3100 IIO DRIVER
 +++M:  Song Qiang <[email protected]>
 +++L:  [email protected]
 +++S:  Maintained
 +++F:  drivers/iio/magnetometer/rm3100*
 +++F:  Documentation/devicetree/bindings/iio/magnetometer/pni,rm3100.txt
 +++
    POSIX CLOCKS and TIMERS
    M:  Thomas Gleixner <[email protected]>
    L:  [email protected]
@@@@@ -12505,7 -12408,7 -12409,7 -12407,7 +12508,7 @@@@@ QLOGIC QLA3XXX NETWORK DRIVE
    M:  [email protected]
    L:  [email protected]
    S:  Supported
 ---F:  Documentation/networking/LICENSE.qla3xxx
 +++F:  Documentation/networking/device_drivers/qlogic/LICENSE.qla3xxx
    F:  drivers/net/ethernet/qlogic/qla3xxx.*
    
    QLOGIC QLA4XXX iSCSI DRIVER
@@@@@ -12557,7 -12460,7 -12461,7 -12459,7 +12560,7 @@@@@ L:     [email protected]
    S:  Maintained
    F:  drivers/bus/fsl-mc/
    F:  Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt
 ---F:  Documentation/networking/dpaa2/overview.rst
 +++F:  Documentation/networking/device_drivers/freescale/dpaa2/overview.rst
    
    QT1010 MEDIA DRIVER
    M:  Antti Palosaari <[email protected]>
@@@@@ -12635,13 -12538,6 -12539,6 -12537,6 +12638,13 @@@@@ L:   [email protected]
    S:  Maintained
    F:  drivers/iommu/qcom_iommu.c
    
 +++QUALCOMM TSENS THERMAL DRIVER
 +++M:  Amit Kucheria <[email protected]>
 +++L:  [email protected]
 +++L:  [email protected]
 +++S:  Maintained
 +++F:  drivers/thermal/qcom/
 +++
    QUALCOMM VENUS VIDEO ACCELERATOR DRIVER
    M:  Stanimir Varbanov <[email protected]>
    L:  [email protected]
@@@@@ -12770,7 -12666,7 -12667,7 -12665,7 +12773,7 @@@@@ S:     Orpha
    F:  drivers/net/wireless/ray*
    
    RCUTORTURE TEST FRAMEWORK
 ---M:  "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 +++M:  "Paul E. McKenney" <[email protected]>
    M:  Josh Triplett <[email protected]>
    R:  Steven Rostedt <[email protected]>
    R:  Mathieu Desnoyers <[email protected]>
@@@@@ -12812,17 -12708,16 -12709,16 -12707,16 +12815,17 @@@@@ M:        Fenghua Yu <[email protected]
    M:  Reinette Chatre <[email protected]>
    L:  [email protected]
    S:  Supported
 ---F:  arch/x86/kernel/cpu/intel_rdt*
 ---F:  arch/x86/include/asm/intel_rdt_sched.h
 ---F:  Documentation/x86/intel_rdt*
 +++F:  arch/x86/kernel/cpu/resctrl/
 +++F:  arch/x86/include/asm/resctrl_sched.h
 +++F:  Documentation/x86/resctrl*
    
    READ-COPY UPDATE (RCU)
 ---M:  "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 +++M:  "Paul E. McKenney" <[email protected]>
    M:  Josh Triplett <[email protected]>
    R:  Steven Rostedt <[email protected]>
    R:  Mathieu Desnoyers <[email protected]>
    R:  Lai Jiangshan <[email protected]>
 +++R:  Joel Fernandes <[email protected]>
    L:  [email protected]
    W:  http://www.rdrop.com/users/paulmck/RCU/
    S:  Supported
@@@@@ -12925,8 -12820,7 -12821,7 -12819,7 +12928,8 @@@@@ RENESAS R-CAR GYROADC DRIVE
    M:  Marek Vasut <[email protected]>
    L:  [email protected]
    S:  Supported
 ---F:  drivers/iio/adc/rcar_gyro_adc.c
 +++F:  Documentation/devicetree/bindings/iio/adc/renesas,gyroadc.txt
 +++F:  drivers/iio/adc/rcar-gyroadc.c
    
    RENESAS R-CAR I2C DRIVERS
    M:  Wolfram Sang <[email protected]>
@@@@@ -12959,7 -12853,7 -12854,7 -12852,7 +12962,7 @@@@@ F:     include/linux/reset-controller.
    RESTARTABLE SEQUENCES SUPPORT
    M:  Mathieu Desnoyers <[email protected]>
    M:  Peter Zijlstra <[email protected]>
 ---M:  "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 +++M:  "Paul E. McKenney" <[email protected]>
    M:  Boqun Feng <[email protected]>
    L:  [email protected]
    S:  Supported
@@@@@ -13218,9 -13112,7 -13113,7 -13111,7 +13221,9 @@@@@ F:     drivers/pci/hotplug/s390_pci_hpc.
    
    S390 VFIO-CCW DRIVER
    M:  Cornelia Huck <[email protected]>
 ---M:  Halil Pasic <[email protected]>
 +++M:  Farhan Ali <[email protected]>
 +++M:  Eric Farman <[email protected]>
 +++R:  Halil Pasic <[email protected]>
    L:  [email protected]
    L:  [email protected]
    S:  Supported
@@@@@ -13493,7 -13385,7 -13386,7 -13384,7 +13496,7 @@@@@ F:     drivers/scsi/sg.
    F:  include/scsi/sg.h
    
    SCSI SUBSYSTEM
 ---M:  "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>
 +++M:  "James E.J. Bottomley" <[email protected]>
    T:  git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
    M:  "Martin K. Petersen" <[email protected]>
    T:  git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
@@@@@ -13934,7 -13826,7 -13827,7 -13825,7 +13937,7 @@@@@ F:     mm/sl?b
    
    SLEEPABLE READ-COPY UPDATE (SRCU)
    M:  Lai Jiangshan <[email protected]>
 ---M:  "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 +++M:  "Paul E. McKenney" <[email protected]>
    M:  Josh Triplett <[email protected]>
    R:  Steven Rostedt <[email protected]>
    R:  Mathieu Desnoyers <[email protected]>
@@@@@ -14329,7 -14221,7 -14222,7 -14220,7 +14332,7 @@@@@ SPIDERNET NETWORK DRIVER for CEL
    M:  Ishizaki Kou <[email protected]>
    L:  [email protected]
    S:  Supported
 ---F:  Documentation/networking/spider_net.txt
 +++F:  Documentation/networking/device_drivers/toshiba/spider_net.txt
    F:  drivers/net/ethernet/toshiba/spider_net*
    
    SPMI SUBSYSTEM
@@@@@ -14363,14 -14255,6 -14256,6 -14254,6 +14366,14 @@@@@ M:   Jan-Benedict Glaw <[email protected]
    S:  Maintained
    F:  arch/alpha/kernel/srm_env.c
    
 +++ST LSM6DSx IMU IIO DRIVER
 +++M:  Lorenzo Bianconi <[email protected]>
 +++L:  [email protected]
 +++W:  http://www.st.com/
 +++S:  Maintained
 +++F:  drivers/iio/imu/st_lsm6dsx/
 +++F:  Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt
 +++
    ST STM32 I2C/SMBUS DRIVER
    M:  Pierre-Yves MORDRET <[email protected]>
    L:  [email protected]
@@@@@ -14456,8 -14340,8 -14341,8 -14339,8 +14459,8 @@@@@ S:     Odd Fixe
    F:  drivers/staging/vt665?/
    
    STAGING - WILC1000 WIFI DRIVER
 ---M:  Aditya Shankar <aditya.shankar@microchip.com>
 ---M:  Ganesh Krishna <ganesh.krishna@microchip.com>
 +++M:  Adham Abozaeid <adham.abozaeid@microchip.com>
 +++M:  Ajay Singh <ajay.kathat@microchip.com>
    L:  [email protected]
    S:  Supported
    F:  drivers/staging/wilc1000/
@@@@@ -14687,11 -14571,9 -14572,9 -14570,9 +14690,11 @@@@@ SYNOPSYS DESIGNWARE DMAC DRIVE
    M:  Viresh Kumar <[email protected]>
    R:  Andy Shevchenko <[email protected]>
    S:  Maintained
 +++F:  Documentation/devicetree/bindings/dma/snps-dma.txt
 +++F:  drivers/dma/dw/
 +++F:  include/dt-bindings/dma/dw-dmac.h
    F:  include/linux/dma/dw.h
    F:  include/linux/platform_data/dma-dw.h
 ---F:  drivers/dma/dw/
    
    SYNOPSYS DESIGNWARE ENTERPRISE ETHERNET DRIVER
    M:  Jose Abreu <[email protected]>
@@@@@ -15335,7 -15217,7 -15218,7 -15216,7 +15338,7 @@@@@ M:     Samuel Chessman <[email protected]
    L:  [email protected] (subscribers-only)
    W:  http://sourceforge.net/projects/tlan/
    S:  Maintained
 ---F:  Documentation/networking/tlan.txt
 +++F:  Documentation/networking/device_drivers/ti/tlan.txt
    F:  drivers/net/ethernet/ti/tlan.*
    
    TM6000 VIDEO4LINUX DRIVER
@@@@@ -15389,7 -15271,7 -15272,7 -15270,7 +15392,7 @@@@@ F:     drivers/platform/x86/topstar-laptop.
    
    TORTURE-TEST MODULES
    M:  Davidlohr Bueso <[email protected]>
 ---M:  "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 +++M:  "Paul E. McKenney" <[email protected]>
    M:  Josh Triplett <[email protected]>
    L:  [email protected]
    S:  Supported
@@@@@ -16007,16 -15889,15 -15890,15 -15888,15 +16010,16 @@@@@ F:        drivers/media/usb/zr364xx
    USER-MODE LINUX (UML)
    M:  Jeff Dike <[email protected]>
    M:  Richard Weinberger <[email protected]>
 +++M:  Anton Ivanov <[email protected]>
    L:  [email protected]
    W:  http://user-mode-linux.sourceforge.net
 +++Q:  https://patchwork.ozlabs.org/project/linux-um/list/
    T:  git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git
    S:  Maintained
    F:  Documentation/virtual/uml/
    F:  arch/um/
    F:  arch/x86/um/
    F:  fs/hostfs/
 ---F:  fs/hppfs/
    
    USERSPACE COPYIN/COPYOUT (UIOVEC)
    M:  Alexander Viro <[email protected]>
@@@@@ -16309,7 -16190,7 -16191,7 -16189,7 +16312,7 @@@@@ F:     drivers/vme
    F:  include/linux/vme*
    
    VMWARE BALLOON DRIVER
 ---M:  Xavier Deguillard <xdeguillard@vmware.com>
 +++M:  Julien Freche <jfreche@vmware.com>
    M:  Nadav Amit <[email protected]>
    M:  "VMware, Inc." <[email protected]>
    L:  [email protected]
@@@@@ -16701,7 -16582,6 -16583,6 -16581,6 +16704,7 @@@@@ L:     [email protected] (mode
    T:  git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git
    S:  Supported
    F:  arch/x86/xen/
 +++F:  arch/x86/platform/pvh/
    F:  drivers/*/xen-*front.c
    F:  drivers/xen/
    F:  arch/x86/include/asm/xen/

diff --combined drivers/cpufreq/cpufreq.c
index 6f23ebb395f14c8fe04225bad75176ca262d197f,7aa3dcad21758c755ef0c76595ed2459ec94d671,df34a12a388f32b8f98196213e211c08d0ca51de,7aa3dcad21758c755ef0c76595ed2459ec94d671..e35a886e00bcf1d18f9683dd7f1a68a7569d4535
--- 1/drivers/cpufreq/cpufreq.c
--- 2/drivers/cpufreq/cpufreq.c
--- 3/drivers/cpufreq/cpufreq.c
--- 4/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@@@@ -1530,17 -1530,17 -1530,16 -1530,17 +1530,16 @@@@@ static unsigned int __cpufreq_get(struc
    {
        unsigned int ret_freq = 0;
    
-- -    if (!cpufreq_driver->get)
++ +    if (unlikely(policy_is_inactive(policy)) || !cpufreq_driver->get)
                return ret_freq;
    
        ret_freq = cpufreq_driver->get(policy->cpu);
    
        /*
-- -     * Updating inactive policies is invalid, so avoid doing that.  Also
-- -     * if fast frequency switching is used with the given policy, the check
++ +     * If fast frequency switching is used with the given policy, the check
         * against policy->cur is pointless, so skip it in that case too.
         */
-- -    if (unlikely(policy_is_inactive(policy)) || policy->fast_switch_enabled)
++ +    if (policy->fast_switch_enabled)
                return ret_freq;
    
        if (ret_freq && policy->cur &&
@@@@@ -1569,10 -1569,10 -1568,7 -1569,10 +1568,7 @@@@@ unsigned int cpufreq_get(unsigned int c
    
        if (policy) {
                down_read(&policy->rwsem);
-- -
-- -            if (!policy_is_inactive(policy))
-- -                    ret_freq = __cpufreq_get(policy);
-- -
++ +            ret_freq = __cpufreq_get(policy);
                up_read(&policy->rwsem);
    
                cpufreq_cpu_put(policy);
@@@@@ -2277,7 -2277,6 -2273,6 -2277,6 +2273,7 @@@@@ static int cpufreq_set_policy(struct cp
                ret = cpufreq_start_governor(policy);
                if (!ret) {
                        pr_debug("cpufreq: governor change\n");
 +++                    sched_cpufreq_governor_change(policy, old_gov);
                        return 0;
                }
                cpufreq_exit_governor(policy);