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

* pm-cpufreq:
  cpufreq: intel_pstate: Fix fast-switch fallback path

* pm-cpuidle:
  intel_idle: add SnowRidge C-state table
  MAINTAINERS: include governors into CPU IDLE TIME MANAGEMENT FRAMEWORK

diff --combined MAINTAINERS
index 546aa66,546aa66,59be280..6eff4f7
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
+++ b/MAINTAINERS
@@@@ -956,14 -956,14 -956,6 +956,14 @@@@ S:     Supporte
   F:   arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi
   F:   drivers/net/ethernet/amd/xgbe/
   
  +AMD SENSOR FUSION HUB DRIVER
  +M:   Nehal Shah <nehal-bakulchandra.shah@amd.com>
  +M:   Sandeep Singh <sandeep.singh@amd.com>
  +L:   linux-input@vger.kernel.org
  +S:   Maintained
  +F:   Documentation/hid/amd-sfh*
  +F:   drivers/hid/amd-sfh-hid/
  +
   AMS AS73211 DRIVER
   M:   Christian Eggers <ceggers@arri.de>
   L:   linux-iio@vger.kernel.org
@@@@ -1183,7 -1183,7 -1175,7 +1183,7 @@@@ F:    Documentation/devicetree/bindings/in
   F:   drivers/irqchip/irq-goldfish-pic.c
   
   ANDROID GOLDFISH RTC DRIVER
  -M:   Miodrag Dinic <miodrag.dinic@mips.com>
  +M:   Jiaxun Yang <jiaxun.yang@flygoat.com>
   S:   Supported
   F:   Documentation/devicetree/bindings/rtc/google,goldfish-rtc.txt
   F:   drivers/rtc/rtc-goldfish.c
@@@@ -1807,6 -1807,6 -1799,14 +1807,6 @@@@ F:   drivers/firmware/turris-mox-rwtm.
   F:   drivers/gpio/gpio-moxtet.c
   F:   include/linux/moxtet.h
   
  -ARM/EBSA110 MACHINE SUPPORT
  -M:   Russell King <linux@armlinux.org.uk>
  -L:   linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  -S:   Maintained
  -W:   http://www.armlinux.org.uk/
  -F:   arch/arm/mach-ebsa110/
  -F:   drivers/net/ethernet/amd/am79c961a.*
  -
   ARM/ENERGY MICRO (SILICON LABS) EFM32 SUPPORT
   M:   Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
   R:   Pengutronix Kernel Team <kernel@pengutronix.de>
@@@@ -2026,7 -2026,7 -2026,7 +2026,7 @@@@ M:    Sebastian Hesselbarth <sebastian.hes
   M:   Gregory Clement <gregory.clement@bootlin.com>
   L:   linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   S:   Maintained
  -T:   git git://git.infradead.org/linux-mvebu.git
  +T:   git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git
   F:   Documentation/devicetree/bindings/soc/dove/
   F:   arch/arm/boot/dts/dove*
   F:   arch/arm/boot/dts/orion5x*
@@@@ -2042,7 -2042,7 -2042,7 +2042,7 @@@@ M:    Gregory Clement <gregory.clement@boo
   M:   Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
   L:   linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   S:   Maintained
  -T:   git git://git.infradead.org/linux-mvebu.git
  +T:   git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git
   F:   arch/arm/boot/dts/armada*
   F:   arch/arm/boot/dts/kirkwood*
   F:   arch/arm/configs/mvebu_*_defconfig
@@@@ -2074,7 -2074,7 -2074,7 +2074,7 @@@@ M:    Matthias Brugger <matthias.bgg@gmail
   L:   linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   L:   linux-mediatek@lists.infradead.org (moderated for non-subscribers)
   S:   Maintained
  -W:   https://mtk.bcnfs.org/
  +W:   https://mtk.wiki.kernel.org/
   C:   irc://chat.freenode.net/linux-mediatek
   F:   arch/arm/boot/dts/mt6*
   F:   arch/arm/boot/dts/mt7*
@@@@ -2124,7 -2124,7 -2124,6 +2124,7 @@@@ L:    linux-arm-kernel@lists.infradead.or
   S:   Supported
   T:   git git://github.com/microchip-ung/linux-upstream.git
   F:   arch/arm64/boot/dts/microchip/
  +F:   drivers/pinctrl/pinctrl-microchip-sgpio.c
   N:   sparx5
   
   Microchip Timer Counter Block (TCB) Capture Driver
@@@@ -2146,11 -2146,11 -2145,8 +2146,11 @@@@ L: linux-arm-kernel@lists.infradead.or
   S:   Maintained
   W:   http://linux-chenxing.org/
   F:   Documentation/devicetree/bindings/arm/mstar/*
  +F:   Documentation/devicetree/bindings/gpio/mstar,msc313-gpio.yaml
   F:   arch/arm/boot/dts/mstar-*
   F:   arch/arm/mach-mstar/
  +F:   drivers/gpio/gpio-msc313.c
  +F:   include/dt-bindings/gpio/msc313-gpio.h
   
   ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT
   M:   Michael Petchkovsky <mkpetch@internode.on.net>
@@@@ -3199,7 -3199,7 -3195,6 +3199,7 @@@@ S:    Maintaine
   T:   git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
   F:   block/
   F:   drivers/block/
  +F:   fs/block_dev.c
   F:   include/linux/blk*
   F:   kernel/trace/blktrace.c
   F:   lib/sbitmap.c
@@@@ -3398,7 -3398,7 -3393,7 +3398,7 @@@@ M:    Florian Fainelli <f.fainelli@gmail.c
   L:   netdev@vger.kernel.org
   L:   openwrt-devel@lists.openwrt.org (subscribers-only)
   S:   Supported
  -F:   Documentation/devicetree/bindings/net/dsa/b53.txt
  +F:   Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml
   F:   drivers/net/dsa/b53/*
   F:   include/linux/platform_data/b53.h
   
@@@@ -4355,8 -4355,8 -4350,8 +4355,8 @@@@ T:    git git://linuxtv.org/media_tree.gi
   F:   drivers/media/pci/cobalt/
   
   COCCINELLE/Semantic Patches (SmPL)
  -M:   Julia Lawall <Julia.Lawall@lip6.fr>
  -M:   Gilles Muller <Gilles.Muller@lip6.fr>
  +M:   Julia Lawall <Julia.Lawall@inria.fr>
  +M:   Gilles Muller <Gilles.Muller@inria.fr>
   M:   Nicolas Palix <nicolas.palix@imag.fr>
   M:   Michal Marek <michal.lkml@markovi.net>
   L:   cocci@systeme.lip6.fr (moderated for non-subscribers)
@@@@ -4588,7 -4588,7 -4583,7 +4588,7 @@@@ B:    https://bugzilla.kernel.or
   T:   git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
   F:   Documentation/admin-guide/pm/cpuidle.rst
   F:   Documentation/driver-api/pm/cpuidle.rst
-- F:   drivers/cpuidle/*
++ F:   drivers/cpuidle/
   F:   include/linux/cpuidle.h
   
   CPU POWER MONITORING SUBSYSTEM
@@@@ -5298,12 -5298,12 -5293,6 +5298,12 @@@@ F: include/linux/dma-mapping.
   F:   include/linux/dma-map-ops.h
   F:   kernel/dma/
   
  +DMA MAPPING BENCHMARK
  +M:   Barry Song <song.bao.hua@hisilicon.com>
  +L:   iommu@lists.linux-foundation.org
  +F:   kernel/dma/map_benchmark.c
  +F:   tools/testing/selftests/dma/
  +
   DMA-BUF HEAPS FRAMEWORK
   M:   Sumit Semwal <sumit.semwal@linaro.org>
   R:   Benjamin Gaignard <benjamin.gaignard@linaro.org>
@@@@ -6755,7 -6755,7 -6744,6 +6755,7 @@@@ F:    Documentation/filesystems/f2fs.rs
   F:   fs/f2fs/
   F:   include/linux/f2fs_fs.h
   F:   include/trace/events/f2fs.h
  +F:   include/uapi/linux/f2fs.h
   
   F71805F HARDWARE MONITORING DRIVER
   M:   Jean Delvare <jdelvare@suse.com>
@@@@ -7359,6 -7359,6 -7347,7 +7359,6 @@@@ F:    drivers/staging/gasket
   
   GCC PLUGINS
   M:   Kees Cook <keescook@chromium.org>
  -R:   Emese Revfy <re.emese@gmail.com>
   L:   linux-hardening@vger.kernel.org
   S:   Maintained
   F:   Documentation/kbuild/gcc-plugins.rst
@@@@ -7509,7 -7509,7 -7498,7 +7509,7 @@@@ M:    Bob Peterson <rpeterso@redhat.com
   M:   Andreas Gruenbacher <agruenba@redhat.com>
   L:   cluster-devel@redhat.com
   S:   Supported
  -W:   http://sources.redhat.com/cluster/
  +B:   https://bugzilla.kernel.org/enter_bug.cgi?product=File%20System&component=gfs2
   T:   git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git
   F:   Documentation/filesystems/gfs2*
   F:   fs/gfs2/
@@@@ -7557,7 -7557,7 -7546,6 +7557,7 @@@@ M:    Andy Shevchenko <andriy.shevchenko@l
   L:   linux-gpio@vger.kernel.org
   L:   linux-acpi@vger.kernel.org
   S:   Maintained
  +T:   git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
   F:   Documentation/firmware-guide/acpi/gpio-properties.rst
   F:   drivers/gpio/gpiolib-acpi.c
   F:   drivers/gpio/gpiolib-acpi.h
@@@@ -7991,12 -7991,12 -7979,6 +7991,12 @@@@ L: dmaengine@vger.kernel.or
   S:   Maintained
   F:   drivers/dma/hisi_dma.c
   
  +HISILICON GPIO DRIVER
  +M:   Luo Jiaxing <luojiaxing@huawei.com>
  +L:   linux-gpio@vger.kernel.org
  +S:   Maintained
  +F:   drivers/gpio/gpio-hisi.c
  +
   HISILICON HIGH PERFORMANCE RSA ENGINE DRIVER (HPRE)
   M:   Zaibo Xu <xuzaibo@huawei.com>
   L:   linux-crypto@vger.kernel.org
@@@@ -8423,7 -8423,7 -8405,7 +8423,7 @@@@ F:    Documentation/devicetree/bindings/i3
   F:   drivers/i3c/master/dw*
   
   I3C SUBSYSTEM
  -M:   Boris Brezillon <bbrezillon@kernel.org>
  +M:   Alexandre Belloni <alexandre.belloni@bootlin.com>
   L:   linux-i3c@lists.infradead.org (moderated for non-subscribers)
   S:   Maintained
   C:   irc://chat.freenode.net/linux-i3c
@@@@ -8763,16 -8763,16 -8745,19 +8763,16 @@@@ F:        include/uapi/rdma
   F:   samples/bpf/ibumad_kern.c
   F:   samples/bpf/ibumad_user.c
   
  -INGENIC JZ4780 DMA Driver
  -M:   Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
  -S:   Maintained
  -F:   drivers/dma/dma-jz4780.c
  -
   INGENIC JZ4780 NAND DRIVER
   M:   Harvey Hunt <harveyhuntnexus@gmail.com>
   L:   linux-mtd@lists.infradead.org
  +L:   linux-mips@vger.kernel.org
   S:   Maintained
   F:   drivers/mtd/nand/raw/ingenic/
   
   INGENIC JZ47xx SoCs
   M:   Paul Cercueil <paul@crapouillou.net>
  +L:   linux-mips@vger.kernel.org
   S:   Maintained
   F:   arch/mips/boot/dts/ingenic/
   F:   arch/mips/generic/board-ingenic.c
@@@@ -9734,7 -9734,7 -9719,7 +9734,7 @@@@ F:    arch/arm64/kvm
   F:   include/kvm/arm_*
   
   KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)
  -M:   Huacai Chen <chenhc@lemote.com>
  +M:   Huacai Chen <chenhuacai@kernel.org>
   M:   Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
   L:   linux-mips@vger.kernel.org
   L:   kvm@vger.kernel.org
@@@@ -10280,16 -10280,16 -10265,6 +10280,16 @@@@ L:     kunit-dev@googlegroups.co
   S:   Maintained
   F:   lib/list-test.c
   
  +LITEX PLATFORM
  +M:   Karol Gugala <kgugala@antmicro.com>
  +M:   Mateusz Holenko <mholenko@antmicro.com>
  +S:   Maintained
  +F:   Documentation/devicetree/bindings/*/litex,*.yaml
  +F:   arch/openrisc/boot/dts/or1klitex.dts
  +F:   drivers/soc/litex/litex_soc_ctrl.c
  +F:   drivers/tty/serial/liteuart.c
  +F:   include/linux/litex.h
  +
   LIVE PATCHING
   M:   Josh Poimboeuf <jpoimboe@redhat.com>
   M:   Jiri Kosina <jikos@kernel.org>
@@@@ -10550,15 -10550,15 -10525,6 +10550,15 @@@@ F:     drivers/mailbox
   F:   include/linux/mailbox_client.h
   F:   include/linux/mailbox_controller.h
   
  +MAILBOX ARM MHUv2
  +M:   Viresh Kumar <viresh.kumar@linaro.org>
  +M:   Tushar Khandelwal <Tushar.Khandelwal@arm.com>
  +L:   linux-kernel@vger.kernel.org
  +S:   Maintained
  +F:   drivers/mailbox/arm_mhuv2.c
  +F:   include/linux/mailbox/arm_mhuv2_message.h
  +F:   Documentation/devicetree/bindings/mailbox/arm,mhuv2.yaml
  +
   MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7
   M:   Michael Kerrisk <mtk.manpages@gmail.com>
   L:   linux-man@vger.kernel.org
@@@@ -11465,7 -11465,7 -11431,6 +11465,7 @@@@ S:        Maintaine
   T:   git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git
   F:   Documentation/devicetree/bindings/memory-controllers/
   F:   drivers/memory/
  +F:   include/dt-bindings/memory/
   
   MEMORY FREQUENCY SCALING DRIVERS FOR NVIDIA TEGRA
   M:   Dmitry Osipenko <digetx@gmail.com>
@@@@ -11818,17 -11818,17 -11783,6 +11818,17 @@@@ M:     Oliver Neukum <oliver@neukum.org
   S:   Maintained
   F:   drivers/usb/image/microtek.*
   
  +MIKROTIK CRS3XX 98DX3236 BOARD SUPPORT
  +M:   Luka Kovacic <luka.kovacic@sartura.hr>
  +M:   Luka Perkov <luka.perkov@sartura.hr>
  +S:   Maintained
  +F:   arch/arm/boot/dts/armada-xp-crs305-1g-4s-bit.dts
  +F:   arch/arm/boot/dts/armada-xp-crs305-1g-4s.dts
  +F:   arch/arm/boot/dts/armada-xp-crs326-24g-2s-bit.dts
  +F:   arch/arm/boot/dts/armada-xp-crs326-24g-2s.dts
  +F:   arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s-bit.dts
  +F:   arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dts
  +
   MIPI CCS, SMIA AND SMIA++ IMAGE SENSOR DRIVER
   M:   Sakari Ailus <sakari.ailus@linux.intel.com>
   L:   linux-media@vger.kernel.org
@@@@ -11907,7 -11907,7 -11861,7 +11907,7 @@@@ F:        drivers/*/*/*loongson2
   F:   drivers/*/*loongson2*
   
   MIPS/LOONGSON64 ARCHITECTURE
  -M:   Huacai Chen <chenhc@lemote.com>
  +M:   Huacai Chen <chenhuacai@kernel.org>
   M:   Jiaxun Yang <jiaxun.yang@flygoat.com>
   L:   linux-mips@vger.kernel.org
   S:   Maintained
@@@@ -13702,8 -13702,8 -13656,6 +13702,8 @@@@ M:        Kishon Vijay Abraham I <kishon@ti.co
   M:   Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
   L:   linux-pci@vger.kernel.org
   S:   Supported
  +F:   Documentation/PCI/endpoint/*
  +F:   Documentation/misc-devices/pci-endpoint-test.rst
   T:   git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/pci-endpoint.git
   F:   drivers/misc/pci_endpoint_test.c
   F:   drivers/pci/endpoint/
@@@@ -15115,7 -15115,7 -15067,7 +15115,7 @@@@ RENESAS CLOCK DRIVER
   M:   Geert Uytterhoeven <geert+renesas@glider.be>
   L:   linux-renesas-soc@vger.kernel.org
   S:   Supported
  -T:   git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas
  +T:   git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git renesas-clk
   F:   Documentation/devicetree/bindings/clock/renesas,*
   F:   drivers/clk/renesas/
   
@@@@ -15838,15 -15838,15 -15790,6 +15838,15 @@@@ F:     Documentation/scsi/st.rs
   F:   drivers/scsi/st.*
   F:   drivers/scsi/st_*.h
   
  +SCSI TARGET CORE USER DRIVER
  +M:   Bodo Stroesser <bostroesser@gmail.com>
  +L:   linux-scsi@vger.kernel.org
  +L:   target-devel@vger.kernel.org
  +S:   Supported
  +F:   Documentation/target/tcmu-design.rst
  +F:   drivers/target/target_core_user.c
  +F:   include/uapi/linux/target_core_user.h
  +
   SCSI TARGET SUBSYSTEM
   M:   "Martin K. Petersen" <martin.petersen@oracle.com>
   L:   linux-scsi@vger.kernel.org
@@@@ -16457,7 -16457,7 -16400,7 +16457,7 @@@@ F:        drivers/infiniband/sw/siw
   F:   include/uapi/rdma/siw-abi.h
   
   SOFT-ROCE DRIVER (rxe)
  -M:   Zhu Yanjun <yanjunz@nvidia.com>
  +M:   Zhu Yanjun <zyjzyj2000@gmail.com>
   L:   linux-rdma@vger.kernel.org
   S:   Supported
   F:   drivers/infiniband/sw/rxe/
@@@@ -16917,22 -16917,22 -16860,6 +16917,22 @@@@ M:     Ion Badulescu <ionut@badula.org
   S:   Odd Fixes
   F:   drivers/net/ethernet/adaptec/starfire*
   
  +STATIC BRANCH/CALL
  +M:   Peter Zijlstra <peterz@infradead.org>
  +M:   Josh Poimboeuf <jpoimboe@redhat.com>
  +M:   Jason Baron <jbaron@akamai.com>
  +R:   Steven Rostedt <rostedt@goodmis.org>
  +R:   Ard Biesheuvel <ardb@kernel.org>
  +S:   Supported
  +F:   arch/*/include/asm/jump_label*.h
  +F:   arch/*/include/asm/static_call*.h
  +F:   arch/*/kernel/jump_label.c
  +F:   arch/*/kernel/static_call.c
  +F:   include/linux/jump_label*.h
  +F:   include/linux/static_call*.h
  +F:   kernel/jump_label.c
  +F:   kernel/static_call.c
  +
   STEC S1220 SKD DRIVER
   M:   Damien Le Moal <Damien.LeMoal@wdc.com>
   L:   linux-block@vger.kernel.org
@@@@ -18025,7 -18025,7 -17952,6 +18025,7 @@@@ T:        git git://git.kernel.org/pub/scm/lin
   F:   Documentation/trace/ftrace.rst
   F:   arch/*/*/*/ftrace.h
   F:   arch/*/kernel/ftrace.c
  +F:   fs/tracefs/
   F:   include/*/ftrace.h
   F:   include/linux/trace*.h
   F:   include/trace/
@@@@ -19532,16 -19532,16 -19458,6 +19532,16 @@@@ S:     Maintaine
   F:   Documentation/devicetree/bindings/net/can/xilinx_can.txt
   F:   drivers/net/can/xilinx_can.c
   
  +XILINX GPIO DRIVER
  +M:   Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
  +R:   Srinivas Neeli <srinivas.neeli@xilinx.com>
  +R:   Michal Simek <michal.simek@xilinx.com>
  +S:   Maintained
  +F:   Documentation/devicetree/bindings/gpio/gpio-xilinx.txt
  +F:   Documentation/devicetree/bindings/gpio/gpio-zynq.txt
  +F:   drivers/gpio/gpio-xilinx.c
  +F:   drivers/gpio/gpio-zynq.c
  +
   XILINX SD-FEC IP CORES
   M:   Derek Kiernan <derek.kiernan@xilinx.com>
   M:   Dragan Cvetic <dragan.cvetic@xilinx.com>