From: Rafael J. Wysocki Date: Fri, 11 Jan 2019 09:09:51 +0000 (+0100) Subject: Merge branches 'pm-cpuidle', 'pm-cpufreq' and 'pm-sleep' X-Git-Tag: v5.0-rc2~20^2 X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/343e60e52a3a093bb7baeca441789724fcac4bb5?hp=-c 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 --- 343e60e52a3a093bb7baeca441789724fcac4bb5 diff --combined MAINTAINERS index 32d444476a90,5cc9e96ff2c3,2a01d1af1e26,7808b166fdb9..f6fc1b9dc00b --- a/MAINTAINERS +++ b/MAINTAINERS @@@@@ -140,7 -140,7 -140,7 -140,7 +140,7 @@@@@ Maintainers List (try to look for most M: Steffen Klassert L: netdev@vger.kernel.org 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 L: netdev@vger.kernel.org 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 +++L: linux-iio@vger.kernel.org +++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 L: linux-media@vger.kernel.org @@@@@ -958,7 -950,6 -950,6 -950,6 +958,7 @@@@@ M: Arve Hjønnevåg M: Martijn Coenen M: Joel Fernandes +++M: Christian Brauner T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git L: devel@driverdev.osuosl.org 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 M: Kevin Hilman L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-amlogic@lists.infradead.org @@@@@ -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 +++R: Suzuki K Poulose L: linux-arm-kernel@lists.infradead.org (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 +++L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) +++L: linux-unisoc@lists.infradead.org (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 L: linux-arm-kernel@lists.infradead.org (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 @@@@@ -2284,7 -2258,6 -2258,6 -2258,6 +2284,7 @@@@@ M: Masahiro Yamada M: Gilad Ben-Yossef L: linux-crypto@vger.kernel.org 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 ---M: Olof Johansson +++M: Enric Balletbo i Serra 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 +++M: Enric Balletbo i Serra +++R: Guenter Roeck +++S: Maintained +++N: cros_ec +++N: cros-ec +++F: drivers/power/supply/cros_usbpd-charger.c +++ CIRRUS LOGIC AUDIO CODEC DRIVERS M: Brian Austin M: Paul Handrigan @@@@@ -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 +++M: Nelson Escobar +++M: Parvi Kaustubhi 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: netdev@vger.kernel.or S: Maintained F: drivers/net/ethernet/ti/cpmac.c -- -CPU FREQUENCY DRIVERS ++ +CPU FREQUENCY SCALING FRAMEWORK M: "Rafael J. Wysocki" M: Viresh Kumar L: linux-pm@vger.kernel.org @@@@@ -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" M: Daniel Lezcano L: linux-pm@vger.kernel.org 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 +++M: Frederic Barrat M: Andrew Donnellan L: linuxppc-dev@lists.ozlabs.org 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 ---M: Matthew R. Ochs ---M: Uma Krishnan +++M: Manoj N. Kumar +++M: Matthew R. Ochs +++M: Uma Krishnan L: linux-scsi@vger.kernel.org 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: netdev@vger.kernel.org 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 +++M: Douglas Miller L: netdev@vger.kernel.org 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 +++M: Mimi Zohar L: linux-integrity@vger.kernel.org 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 ---M: Philip Kelleher +++M: Philip Kelleher 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 +++M: Eddie James L: linux-i2c@vger.kernel.org L: openbmc@lists.ozlabs.org (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 @@@@@ -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 ---M: Guilherme G. Piccoli +++M: Frank Haverkamp 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 ---R: Bartosz Golaszewski L: linux-gpio@vger.kernel.org S: Maintained F: drivers/gpio/gpio-mockup.c @@@@@ -6943,14 -6902,6 -6903,6 -6901,6 +6946,14 @@@@@ L: linux-input@vger.kernel.or S: Maintained F: drivers/input/touchscreen/htcpen.c +++HTS221 TEMPERATURE-HUMIDITY IIO DRIVER +++M: Lorenzo Bianconi +++L: linux-iio@vger.kernel.org +++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 L: netdev@vger.kernel.org @@@@@ -6998,7 -6949,7 -6950,7 -6948,7 +7001,7 @@@@@ M: Sasha Levin ---M: Paulo Flabiano Smorigo +++M: Breno Leitão +++M: Nayna Jain +++M: Paulo Flabiano Smorigo L: linux-crypto@vger.kernel.org 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 ---M: John Allen +++M: Thomas Falcon +++M: John Allen L: netdev@vger.kernel.org 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 +++M: Thomas Falcon L: netdev@vger.kernel.org S: Supported F: drivers/net/ethernet/ibm/ibmveth.* IBM Power Virtual FC Device Drivers ---M: Tyrel Datwyler +++M: Tyrel Datwyler L: linux-scsi@vger.kernel.org S: Supported F: drivers/scsi/ibmvscsi/ibmvfc* IBM Power Virtual Management Channel Driver ---M: Bryant G. Ly ---M: Steven Royer +++M: Steven Royer S: Supported F: drivers/misc/ibmvmc.* IBM Power Virtual SCSI Device Drivers ---M: Tyrel Datwyler +++M: Tyrel Datwyler L: linux-scsi@vger.kernel.org S: Supported F: drivers/scsi/ibmvscsi/ibmvscsi* F: include/scsi/viosrp.h IBM Power Virtual SCSI Device Target Driver ---M: Bryant G. Ly ---M: Michael Cyr +++M: Michael Cyr L: linux-scsi@vger.kernel.org L: target-devel@vger.kernel.org S: Supported F: drivers/scsi/ibmvscsi_tgt/ IBM Power VMX Cryptographic instructions ---M: Leonidas S. Barbosa ---M: Paulo Flabiano Smorigo +++M: Breno Leitão +++M: Nayna Jain +++M: Paulo Flabiano Smorigo L: linux-crypto@vger.kernel.org S: Supported F: drivers/crypto/vmx/Makefile @@@@@ -7540,7 -7491,7 -7492,7 -7490,7 +7543,7 @@@@@ S: Maintaine L: linux-crypto@vger.kernel.org INTEGRITY MEASUREMENT ARCHITECTURE (IMA) ---M: Mimi Zohar +++M: Mimi Zohar M: Dmitry Kasatkin L: linux-integrity@vger.kernel.org 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 L: linux-wireless@vger.kernel.org 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: linux-serial@vger.kernel.or S: Maintained F: drivers/tty/serial/ioc3_serial.c +++IOMAP FILESYSTEM LIBRARY +++M: Christoph Hellwig +++M: Darrick J. Wong +++M: linux-xfs@vger.kernel.org +++M: linux-fsdevel@vger.kernel.org +++L: linux-xfs@vger.kernel.org +++L: linux-fsdevel@vger.kernel.org +++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 L: iommu@lists.linux-foundation.org @@@@@ -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 ---L: isdn4linux@listserv.isdn4linux.de (subscribers-only) ---W: http://www.melware.de ---S: Maintained ---F: drivers/isdn/hardware/eicon/ --- IT87 HARDWARE MONITORING DRIVER M: Jean Delvare L: linux-hwmon@vger.kernel.org @@@@@ -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 L: linux-serial@vger.kernel.org ---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 +++M: Mimi Zohar L: linux-integrity@vger.kernel.org L: keyrings@vger.kernel.org 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 +++M: James Bottomley M: Jarkko Sakkinen ---M: Mimi Zohar +++M: Mimi Zohar L: linux-integrity@vger.kernel.org L: keyrings@vger.kernel.org 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 +++M: Naveen N. Rao M: Anil S Keshavamurthy M: "David S. Miller" M: Masami Hiramatsu @@@@@ -8806,7 -8752,7 -8753,7 -8751,7 +8809,7 @@@@@ M: Nicholas Piggin M: Jade Alglave M: Luc Maranget ---M: "Paul E. McKenney" +++M: "Paul E. McKenney" R: Akira Yokosawa R: Daniel Lustig L: linux-kernel@vger.kernel.org @@@@@ -9118,11 -9064,6 -9065,6 -9063,6 +9121,11 @@@@@ L: netdev@vger.kernel.or S: Maintained F: drivers/net/phy/marvell10g.c +++MARVELL MVEBU THERMAL DRIVER +++M: Miquel Raynal +++S: Maintained +++F: drivers/thermal/armada_thermal.c +++ MARVELL MVNETA ETHERNET DRIVER M: Thomas Petazzoni L: netdev@vger.kernel.org @@@@@ -9776,7 -9717,7 -9718,7 -9716,7 +9779,7 @@@@@ F: drivers/platform/x86/mlx-platform. MEMBARRIER SUPPORT M: Mathieu Desnoyers ---M: "Paul E. McKenney" +++M: "Paul E. McKenney" L: linux-kernel@vger.kernel.org S: Supported F: kernel/sched/membarrier.c @@@@@ -9951,13 -9892,6 -9893,6 -9891,6 +9954,13 @@@@@ M: Ludovic Desroches +++L: linux-arm-kernel@lists.infradead.org (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 M: Kent Gustavsson @@@@@ -9995,12 -9929,6 -9930,6 -9928,6 +9998,12 @@@@@ M: Nicolas Ferre +++L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) +++L: linux-gpio@vger.kernel.org +++F: drivers/gpio/gpio-sama5d2-piobu.c +++ MICROCHIP SPI DRIVER M: Nicolas Ferre S: Supported @@@@@ -10042,9 -9970,8 -9971,8 -9969,8 +10045,9 @@@@@ F: drivers/dma/at_xdmac. MICROSEMI MIPS SOCS M: Alexandre Belloni +++M: Microchip Linux Driver Support L: linux-mips@vger.kernel.org ---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 +++M: Microchip Linux Driver Support L: netdev@vger.kernel.org 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 L: netdev@vger.kernel.org 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: linux-nfc@lists.01.org (moderated fo S: Supported F: drivers/nfc/nxp-nci +++OBJAGG +++M: Jiri Pirko +++L: netdev@vger.kernel.org +++S: Supported +++F: lib/objagg.c +++F: lib/test_objagg.c +++F: include/linux/objagg.h +++ OBJTOOL M: Josh Poimboeuf M: Peter Zijlstra @@@@@ -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 +++M: Frederic Barrat M: Andrew Donnellan L: linuxppc-dev@lists.ozlabs.org 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 @@@@@ -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 +++L: linux-pci@vger.kernel.org +++L: linux-amlogic@lists.infradead.org +++S: Maintained +++F: drivers/pci/controller/dwc/pci-meson.c +++ PCIE DRIVER FOR AXIS ARTPEC M: Jesper Nilsson L: linux-arm-kernel@axis.com @@@@@ -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 M: Shawn Guo L: linux-pci@vger.kernel.org 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 +++L: linux-pci@vger.kernel.org +++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 L: linux-pci@vger.kernel.org @@@@@ -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 ---L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) ---S: Maintained ---F: drivers/pinctrl/pinctrl-at91.* --- ---PIN CONTROLLER - ATMEL AT91 PIO4 +++PIN CONTROLLER - MICROCHIP AT91 M: Ludovic Desroches L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-gpio@vger.kernel.org S: Supported ---F: drivers/pinctrl/pinctrl-at91-pio4.* +++F: drivers/pinctrl/pinctrl-at91* PIN CONTROLLER - FREESCALE M: Dong Aisheng @@@@@ -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 M: Geert Uytterhoeven L: linux-renesas-soc@vger.kernel.org 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" +++L: linux-iio@vger.kernel.org +++S: Maintained +++F: drivers/iio/magnetometer/rm3100* +++F: Documentation/devicetree/bindings/iio/magnetometer/pni,rm3100.txt +++ POSIX CLOCKS and TIMERS M: Thomas Gleixner L: linux-kernel@vger.kernel.org @@@@@ -12505,7 -12408,7 -12409,7 -12407,7 +12508,7 @@@@@ QLOGIC QLA3XXX NETWORK DRIVE M: Dept-GELinuxNICDev@cavium.com L: netdev@vger.kernel.org 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: linux-kernel@vger.kernel.or 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 @@@@@ -12635,13 -12538,6 -12539,6 -12537,6 +12638,13 @@@@@ L: linux-arm-msm@vger.kernel.or S: Maintained F: drivers/iommu/qcom_iommu.c +++QUALCOMM TSENS THERMAL DRIVER +++M: Amit Kucheria +++L: linux-pm@vger.kernel.org +++L: linux-arm-msm@vger.kernel.org +++S: Maintained +++F: drivers/thermal/qcom/ +++ QUALCOMM VENUS VIDEO ACCELERATOR DRIVER M: Stanimir Varbanov L: linux-media@vger.kernel.org @@@@@ -12770,7 -12666,7 -12667,7 -12665,7 +12773,7 @@@@@ S: Orpha F: drivers/net/wireless/ray* RCUTORTURE TEST FRAMEWORK ---M: "Paul E. McKenney" +++M: "Paul E. McKenney" M: Josh Triplett R: Steven Rostedt R: Mathieu Desnoyers @@@@@ -12812,17 -12708,16 -12709,16 -12707,16 +12815,17 @@@@@ M: Fenghua Yu L: linux-kernel@vger.kernel.org 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" +++M: "Paul E. McKenney" M: Josh Triplett R: Steven Rostedt R: Mathieu Desnoyers R: Lai Jiangshan +++R: Joel Fernandes L: linux-kernel@vger.kernel.org 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 L: linux-iio@vger.kernel.org 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 @@@@@ -12959,7 -12853,7 -12854,7 -12852,7 +12962,7 @@@@@ F: include/linux/reset-controller. RESTARTABLE SEQUENCES SUPPORT M: Mathieu Desnoyers M: Peter Zijlstra ---M: "Paul E. McKenney" +++M: "Paul E. McKenney" M: Boqun Feng L: linux-kernel@vger.kernel.org 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 ---M: Halil Pasic +++M: Farhan Ali +++M: Eric Farman +++R: Halil Pasic L: linux-s390@vger.kernel.org L: kvm@vger.kernel.org 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" +++M: "James E.J. Bottomley" T: git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git M: "Martin K. Petersen" 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 ---M: "Paul E. McKenney" +++M: "Paul E. McKenney" M: Josh Triplett R: Steven Rostedt R: Mathieu Desnoyers @@@@@ -14329,7 -14221,7 -14222,7 -14220,7 +14332,7 @@@@@ SPIDERNET NETWORK DRIVER for CEL M: Ishizaki Kou L: netdev@vger.kernel.org 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 +++L: linux-iio@vger.kernel.org +++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 L: linux-i2c@vger.kernel.org @@@@@ -14456,8 -14340,8 -14341,8 -14339,8 +14459,8 @@@@@ S: Odd Fixe F: drivers/staging/vt665?/ STAGING - WILC1000 WIFI DRIVER ---M: Aditya Shankar ---M: Ganesh Krishna +++M: Adham Abozaeid +++M: Ajay Singh L: linux-wireless@vger.kernel.org S: Supported F: drivers/staging/wilc1000/ @@@@@ -14687,11 -14571,9 -14572,9 -14570,9 +14690,11 @@@@@ SYNOPSYS DESIGNWARE DMAC DRIVE M: Viresh Kumar R: Andy Shevchenko 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 @@@@@ -15335,7 -15217,7 -15218,7 -15216,7 +15338,7 @@@@@ M: Samuel Chessman ---M: "Paul E. McKenney" +++M: "Paul E. McKenney" M: Josh Triplett L: linux-kernel@vger.kernel.org S: Supported @@@@@ -16007,16 -15889,15 -15890,15 -15888,15 +16010,16 @@@@@ F: drivers/media/usb/zr364xx USER-MODE LINUX (UML) M: Jeff Dike M: Richard Weinberger +++M: Anton Ivanov L: linux-um@lists.infradead.org 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 @@@@@ -16309,7 -16190,7 -16191,7 -16189,7 +16312,7 @@@@@ F: drivers/vme F: include/linux/vme* VMWARE BALLOON DRIVER ---M: Xavier Deguillard +++M: Julien Freche M: Nadav Amit M: "VMware, Inc." L: linux-kernel@vger.kernel.org @@@@@ -16701,7 -16582,6 -16583,6 -16581,6 +16704,7 @@@@@ L: xen-devel@lists.xenproject.org (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 6f23ebb395f1,7aa3dcad2175,df34a12a388f,7aa3dcad2175..e35a886e00bc --- a/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);