Merge tag 'pm-4.20-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

Pull more power management updates from Rafael Wysocki:
 "These remove a questionable heuristic from the menu cpuidle governor,
  fix a recent build regression in the intel_pstate driver, clean up ARM
  big-Little support in cpufreq and fix up hung task watchdog's
  interaction with system-wide power management transitions.

  Specifics:

   - Fix build regression in the intel_pstate driver that doesn't build
     without CONFIG_ACPI after recent changes (Dominik Brodowski).

   - One of the heuristics in the menu cpuidle governor is based on a
     function returning 0 most of the time, so drop it and clean up the
     scheduler code related to it (Daniel Lezcano).

   - Prevent the arm_big_little cpufreq driver from being used on ARM64
     which is not suitable for it and drop the arm_big_little_dt driver
     that is not used any more (Sudeep Holla).

   - Prevent the hung task watchdog from triggering during resume from
     system-wide sleep states by disabling it before freezing tasks and
     enabling it again after they have been thawed (Vitaly Kuznetsov)"

* tag 'pm-4.20-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  kernel: hung_task.c: disable on suspend
  cpufreq: remove unused arm_big_little_dt driver
  cpufreq: drop ARM_BIG_LITTLE_CPUFREQ support for ARM64
  cpufreq: intel_pstate: Fix compilation for !CONFIG_ACPI
  cpuidle: menu: Remove get_loadavg() from the performance multiplier
  sched: Factor out nr_iowait and nr_iowait_cpu

diff --combined MAINTAINERS
index 5d1c3ae9f93369c4b7076a6176f469f66a6379b0,874cc7a54e56538c8d6ca21cd3aa7f756df25f50..49ee13372e5bbb883568dc96e41ff7f51ab22752
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -535,7 -535,7 +535,7 @@@ F: Documentation/hwmon/adt747
  F:    drivers/hwmon/adt7475.c
  
  ADVANSYS SCSI DRIVER
 -M:    Matthew Wilcox <[email protected]>
 +M:    Matthew Wilcox <[email protected]>
  M:    Hannes Reinecke <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -549,15 -549,6 +549,15 @@@ W:       http://ez.analog.com/community/linux
  S:    Supported
  F:    drivers/input/misc/adxl34x.c
  
 +ADXL372 THREE-AXIS DIGITAL ACCELEROMETER DRIVER
 +M:    Stefan Popa <[email protected]>
 +W:    http://ez.analog.com/community/linux-device-drivers
 +S:    Supported
 +F:    drivers/iio/accel/adxl372.c
 +F:    drivers/iio/accel/adxl372_spi.c
 +F:    drivers/iio/accel/adxl372_i2c.c
 +F:    Documentation/devicetree/bindings/iio/accel/adxl372.txt
 +
  AF9013 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
@@@ -941,7 -932,6 +941,7 @@@ M: Greg Kroah-Hartman <gregkh@linuxfoun
  M:    Arve Hjønnevåg <[email protected]>
  M:    Todd Kjos <[email protected]>
  M:    Martijn Coenen <[email protected]>
 +M:    Joel Fernandes <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
  L:    [email protected]
  S:    Supported
@@@ -1087,29 -1077,6 +1087,29 @@@ F:    arch/arm/include/asm/arch_timer.
  F:    arch/arm64/include/asm/arch_timer.h
  F:    drivers/clocksource/arm_arch_timer.c
  
 +ARM INTEGRATOR, VERSATILE AND REALVIEW SUPPORT
 +M:    Linus Walleij <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/arm/arm-boards
 +F:    Documentation/devicetree/bindings/auxdisplay/arm-charlcd.txt
 +F:    Documentation/devicetree/bindings/clock/arm-integrator.txt
 +F:    Documentation/devicetree/bindings/interrupt-controller/arm,versatile-fpga-irq.txt
 +F:    Documentation/devicetree/bindings/mtd/arm-versatile.txt
 +F:    arch/arm/mach-integrator/
 +F:    arch/arm/mach-realview/
 +F:    arch/arm/mach-versatile/
 +F:    arch/arm/plat-versatile/
 +F:    arch/arm/boot/dts/arm-realview-*
 +F:    arch/arm/boot/dts/integrator*
 +F:    arch/arm/boot/dts/versatile*
 +F:    drivers/clk/versatile/
 +F:    drivers/i2c/busses/i2c-versatile.c
 +F:    drivers/irqchip/irq-versatile-fpga.c
 +F:    drivers/mtd/maps/physmap_of_versatile.c
 +F:    drivers/power/reset/arm-versatile-reboot.c
 +F:    drivers/soc/versatile/
 +
  ARM HDLCD DRM DRIVER
  M:    Liviu Dudau <[email protected]>
  S:    Supported
@@@ -1182,26 -1149,12 +1182,26 @@@ S:   Odd Fixe
  F:    drivers/mmc/host/mmci.*
  F:    include/linux/amba/mmci.h
  
 +ARM PRIMECELL SSP PL022 SPI DRIVER
 +M:    Linus Walleij <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/spi/spi_pl022.txt
 +F:    drivers/spi/spi-pl022.c
 +
  ARM PRIMECELL UART PL010 AND PL011 DRIVERS
  M:    Russell King <[email protected]>
  S:    Odd Fixes
  F:    drivers/tty/serial/amba-pl01*.c
  F:    include/linux/amba/serial.h
  
 +ARM PRIMECELL VIC PL190/PL192 DRIVER
 +M:    Linus Walleij <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/interrupt-controller/arm,vic.txt
 +F:    drivers/irqchip/irq-vic.c
 +
  ARM SMMU DRIVERS
  M:    Will Deacon <[email protected]>
  R:    Robin Murphy <[email protected]>
@@@ -1221,25 -1174,18 +1221,25 @@@ T:   git git://git.kernel.org/pub/scm/lin
  
  ARM/ACTIONS SEMI ARCHITECTURE
  M:    Andreas Färber <[email protected]>
 +R:    Manivannan Sadhasivam <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  N:    owl
  F:    arch/arm/mach-actions/
  F:    arch/arm/boot/dts/owl-*
  F:    arch/arm64/boot/dts/actions/
 -F:    drivers/clocksource/owl-*
 +F:    drivers/clk/actions/
 +F:    drivers/clocksource/timer-owl*
 +F:    drivers/dma/owl-dma.c
 +F:    drivers/i2c/busses/i2c-owl.c
  F:    drivers/pinctrl/actions/*
  F:    drivers/soc/actions/
  F:    include/dt-bindings/power/owl-*
  F:    include/linux/soc/actions/
  F:    Documentation/devicetree/bindings/arm/actions.txt
 +F:    Documentation/devicetree/bindings/clock/actions,owl-cmu.txt
 +F:    Documentation/devicetree/bindings/dma/owl-dma.txt
 +F:    Documentation/devicetree/bindings/i2c/i2c-owl.txt
  F:    Documentation/devicetree/bindings/pinctrl/actions,s900-pinctrl.txt
  F:    Documentation/devicetree/bindings/power/actions,owl-sps.txt
  F:    Documentation/devicetree/bindings/timer/actions,owl-timer.txt
@@@ -1515,9 -1461,7 +1515,9 @@@ F:      arch/arm/mach-mxs
  F:    arch/arm/boot/dts/imx*
  F:    arch/arm/configs/imx*_defconfig
  F:    drivers/clk/imx/
 +F:    drivers/firmware/imx/
  F:    drivers/soc/imx/
 +F:    include/linux/firmware/imx/
  F:    include/soc/imx/
  
  ARM/FREESCALE VYBRID ARM ARCHITECTURE
@@@ -1654,10 -1598,12 +1654,10 @@@ L:   [email protected]
  S:    Maintained
  
  ARM/LPC18XX ARCHITECTURE
 -M:    Joachim Eastwood <manabian@gmail.com>
 +M:    Vladimir Zapolskiy <vz@mleia.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/boot/dts/lpc43*
 -F:    drivers/clk/nxp/clk-lpc18xx*
 -F:    drivers/clocksource/time-lpc32xx.c
  F:    drivers/i2c/busses/i2c-lpc2k.c
  F:    drivers/memory/pl172.c
  F:    drivers/mtd/spi-nor/nxp-spifi.c
@@@ -1756,10 -1702,9 +1756,10 @@@ S:    Odd Fixe
  ARM/Microchip (AT91) SoC support
  M:    Nicolas Ferre <[email protected]>
  M:    Alexandre Belloni <[email protected]>
 +M:    Ludovic Desroches <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  W:    http://www.linux4sam.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git
  S:    Supported
  N:    at91
  N:    atmel
@@@ -2139,24 -2084,22 +2139,24 @@@ F:   include/linux/remoteproc/st_slim_rpr
  ARM/STM32 ARCHITECTURE
  M:    Maxime Coquelin <[email protected]>
  M:    Alexandre Torgue <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32-next
  N:    stm32
 +N:    stm
  F:    arch/arm/boot/dts/stm32*
  F:    arch/arm/mach-stm32/
  F:    drivers/clocksource/armv7m_systick.c
  
 -ARM/Synaptics Berlin SoC support
 +ARM/Synaptics SoC support
  M:    Jisheng Zhang <[email protected]>
  M:    Sebastian Hesselbarth <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-berlin/
  F:    arch/arm/boot/dts/berlin*
 -F:    arch/arm64/boot/dts/marvell/berlin*
 +F:    arch/arm64/boot/dts/synaptics/
  
  ARM/TANGO ARCHITECTURE
  M:    Marc Gonzalez <[email protected]>
@@@ -2277,7 -2220,7 +2277,7 @@@ F:      arch/arm/mach-vexpress
  F:    */*/vexpress*
  F:    */*/*/vexpress*
  F:    drivers/clk/versatile/clk-vexpress-osc.c
 -F:    drivers/clocksource/versatile.c
 +F:    drivers/clocksource/timer-versatile.c
  N:    mps2
  
  ARM/VFP SUPPORT
@@@ -2299,7 -2242,7 +2299,7 @@@ M:      Tony Prisk <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-vt8500/
 -F:    drivers/clocksource/vt8500_timer.c
 +F:    drivers/clocksource/timer-vt8500.c
  F:    drivers/i2c/busses/i2c-wmt.c
  F:    drivers/mmc/host/wmt-sdmmc.c
  F:    drivers/pwm/pwm-vt8500.c
@@@ -2320,6 -2263,7 +2320,6 @@@ F:      arch/arm/mach-pxa/include/mach/z2.
  
  ARM/ZTE ARCHITECTURE
  M:    Jun Nie <[email protected]>
 -M:    Baoyou Xie <[email protected]>
  M:    Shawn Guo <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -2363,7 -2307,7 +2363,7 @@@ F:      drivers/cpuidle/cpuidle-zynq.
  F:    drivers/block/xsysace.c
  N:    zynq
  N:    xilinx
 -F:    drivers/clocksource/cadence_ttc_timer.c
 +F:    drivers/clocksource/timer-cadence-ttc.c
  F:    drivers/i2c/busses/i2c-cadence.c
  F:    drivers/mmc/host/sdhci-of-arasan.c
  F:    drivers/edac/synopsys_edac.c
@@@ -2527,6 -2471,42 +2527,6 @@@ F:     drivers/atm
  F:    include/linux/atm*
  F:    include/uapi/linux/atm*
  
 -ATMEL AT91 / AT32 MCI DRIVER
 -M:    Ludovic Desroches <[email protected]>
 -S:    Maintained
 -F:    drivers/mmc/host/atmel-mci.c
 -
 -ATMEL AT91 SAMA5D2-Compatible Shutdown Controller
 -M:    Nicolas Ferre <[email protected]>
 -S:    Supported
 -F:    drivers/power/reset/at91-sama5d2_shdwc.c
 -
 -ATMEL Audio ALSA driver
 -M:    Nicolas Ferre <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Supported
 -F:    sound/soc/atmel
 -
 -ATMEL I2C DRIVER
 -M:    Ludovic Desroches <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/i2c/busses/i2c-at91.c
 -
 -ATMEL ISI DRIVER
 -M:    Ludovic Desroches <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/media/platform/atmel/atmel-isi.c
 -F:    include/media/atmel-isi.h
 -
 -ATMEL LCDFB DRIVER
 -M:    Nicolas Ferre <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/video/fbdev/atmel_lcdfb.c
 -F:    include/video/atmel_lcdc.h
 -
  ATMEL MACB ETHERNET DRIVER
  M:    Nicolas Ferre <[email protected]>
  S:    Supported
@@@ -2539,6 -2519,43 +2539,6 @@@ S:     Maintaine
  F:    Documentation/devicetree/bindings/input/atmel,maxtouch.txt
  F:    drivers/input/touchscreen/atmel_mxt_ts.c
  
 -ATMEL SAMA5D2 ADC DRIVER
 -M:    Ludovic Desroches <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/iio/adc/at91-sama5d2_adc.c
 -
 -ATMEL SDMMC DRIVER
 -M:    Ludovic Desroches <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/mmc/host/sdhci-of-at91.c
 -
 -ATMEL SPI DRIVER
 -M:    Nicolas Ferre <[email protected]>
 -S:    Supported
 -F:    drivers/spi/spi-atmel.*
 -
 -ATMEL SSC DRIVER
 -M:    Nicolas Ferre <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Supported
 -F:    drivers/misc/atmel-ssc.c
 -F:    include/linux/atmel-ssc.h
 -
 -ATMEL Timer Counter (TC) AND CLOCKSOURCE DRIVERS
 -M:    Nicolas Ferre <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Supported
 -F:    drivers/misc/atmel_tclib.c
 -F:    drivers/clocksource/tcb_clksrc.c
 -
 -ATMEL USBA UDC DRIVER
 -M:    Nicolas Ferre <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Supported
 -F:    drivers/usb/gadget/udc/atmel_usba_udc.*
 -
  ATMEL WIRELESS DRIVER
  M:    Simon Kelley <[email protected]>
  L:    [email protected]
@@@ -2547,6 -2564,13 +2547,6 @@@ W:     http://atmelwlandriver.sourceforge.n
  S:    Maintained
  F:    drivers/net/wireless/atmel/atmel*
  
 -ATMEL XDMA DRIVER
 -M:    Ludovic Desroches <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/dma/at_xdmac.c
 -
  ATOMIC INFRASTRUCTURE
  M:    Will Deacon <[email protected]>
  M:    Peter Zijlstra <[email protected]>
@@@ -3160,7 -3184,7 +3160,7 @@@ F:      drivers/gpio/gpio-bt8xx.
  
  BTRFS FILE SYSTEM
  M:    Chris Mason <[email protected]>
 -M:    Josef Bacik <jbacik@fb.com>
 +M:    Josef Bacik <josef@toxicpanda.com>
  M:    David Sterba <[email protected]>
  L:    [email protected]
  W:    http://btrfs.wiki.kernel.org/
@@@ -3204,15 -3228,6 +3204,15 @@@ T:    git git://git.alsa-project.org/alsa-
  S:    Maintained
  F:    sound/pci/oxygen/
  
 +C-SKY ARCHITECTURE
 +M:    Guo Ren <[email protected]>
 +T:    git https://github.com/c-sky/csky-linux.git
 +S:    Supported
 +F:    arch/csky/
 +F:    Documentation/devicetree/bindings/csky/
 +K:    csky
 +N:    csky
 +
  C6X ARCHITECTURE
  M:    Mark Salter <[email protected]>
  M:    Aurelien Jacquiot <[email protected]>
@@@ -3823,7 -3838,6 +3823,6 @@@ W:      http://www.arm.com/products/processo
  S:    Maintained
  F:    drivers/cpufreq/arm_big_little.h
  F:    drivers/cpufreq/arm_big_little.c
- F:    drivers/cpufreq/arm_big_little_dt.c
  
  CPU POWER MONITORING SUBSYSTEM
  M:    Thomas Renninger <[email protected]>
@@@ -4040,7 -4054,7 +4039,7 @@@ M:      Uma Krishnan <[email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/cxlflash/
 -F:    include/uapi/scsi/cxlflash_ioctls.h
 +F:    include/uapi/scsi/cxlflash_ioctl.h
  F:    Documentation/powerpc/cxlflash.txt
  
  CYBERPRO FB DRIVER
@@@ -4083,7 -4097,7 +4082,7 @@@ D-LINK DIR-685 TOUCHKEYS DRIVE
  M:    Linus Walleij <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/input/dlink-dir685-touchkeys.c
 +F:    drivers/input/keyboard/dlink-dir685-touchkeys.c
  
  DALLAS/MAXIM DS1685-FAMILY REAL TIME CLOCK
  M:    Joshua Kinard <[email protected]>
@@@ -4363,6 -4377,13 +4362,6 @@@ L:     [email protected]
  S:    Maintained
  F:    drivers/gpio/gpio-gpio-mm.c
  
 -DIGI NEO AND CLASSIC PCI PRODUCTS
 -M:    Lidza Louina <[email protected]>
 -M:    Mark Hounschell <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/staging/dgnc/
 -
  DIOLAN U2C-12 I2C DRIVER
  M:    Guenter Roeck <[email protected]>
  L:    [email protected]
@@@ -4370,7 -4391,7 +4369,7 @@@ S:      Maintaine
  F:    drivers/i2c/busses/i2c-diolan-u2c.c
  
  FILESYSTEM DIRECT ACCESS (DAX)
 -M:    Matthew Wilcox <[email protected]>
 +M:    Matthew Wilcox <[email protected]>
  M:    Ross Zwisler <[email protected]>
  M:    Jan Kara <[email protected]>
  L:    [email protected]
@@@ -4512,15 -4533,13 +4511,15 @@@ L:   [email protected]
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/i2c/dw9714.c
 +F:    Documentation/devicetree/bindings/media/i2c/dongwoon,dw9714.txt
  
  DONGWOON DW9807 LENS VOICE COIL DRIVER
  M:    Sakari Ailus <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
 -F:    drivers/media/i2c/dw9807.c
 +F:    drivers/media/i2c/dw9807-vcm.c
 +F:    Documentation/devicetree/bindings/media/i2c/dongwoon,dw9807-vcm.txt
  
  DOUBLETALK DRIVER
  M:    "James R. Van Zandt" <[email protected]>
@@@ -4735,11 -4754,8 +4734,11 @@@ F:    drivers/gpu/drm/tdfx
  
  DRM DRIVER FOR USB DISPLAYLINK VIDEO ADAPTERS
  M:    Dave Airlie <[email protected]>
 +R:    Sean Paul <[email protected]>
 +L:    [email protected]
  S:    Odd Fixes
  F:    drivers/gpu/drm/udl/
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  
  DRM DRIVER FOR VMWARE VIRTUAL GPU
  M:    "VMware Graphics" <[email protected]>
@@@ -4769,8 -4785,8 +4768,8 @@@ F:      include/uapi/drm
  F:    include/linux/vga*
  
  DRM DRIVERS AND MISC GPU PATCHES
 -M:    Gustavo Padovan <[email protected]>
  M:    Maarten Lankhorst <[email protected]>
 +M:    Maxime Ripard <[email protected]>
  M:    Sean Paul <[email protected]>
  W:    https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
  S:    Maintained
@@@ -4839,7 -4855,6 +4838,7 @@@ F:      drivers/gpu/drm/fsl-dcu
  F:    Documentation/devicetree/bindings/display/fsl,dcu.txt
  F:    Documentation/devicetree/bindings/display/fsl,tcon.txt
  F:    Documentation/devicetree/bindings/display/panel/nec,nl4827hc19-05b.txt
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  
  DRM DRIVERS FOR FREESCALE IMX
  M:    Philipp Zabel <[email protected]>
@@@ -4889,10 -4904,9 +4888,10 @@@ F:    Documentation/devicetree/bindings/di
  
  DRM DRIVERS FOR RENESAS
  M:    Laurent Pinchart <[email protected]>
 +M:    Kieran Bingham <[email protected]>
  L:    [email protected]
  L:    [email protected]
 -T:    git git://linuxtv.org/pinchartl/fbdev
 +T:    git git://linuxtv.org/pinchartl/media drm/du/next
  S:    Supported
  F:    drivers/gpu/drm/rcar-du/
  F:    drivers/gpu/drm/shmobile/
@@@ -5367,14 -5381,6 +5366,14 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/edac/ti_edac.c
  
 +EDAC-QCOM
 +M:    Channagoud Kadabi <[email protected]>
 +M:    Venkata Narendra Kumar Gutta <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/edac/qcom_edac.c
 +
  EDIROL UA-101/UA-1000 DRIVER
  M:    Clemens Ladisch <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -5653,9 -5659,10 +5652,9 @@@ F:     Documentation/fault-injection
  F:    lib/fault-inject.c
  
  FBTFT Framebuffer drivers
 -M:    Thomas Petazzoni <[email protected]>
 +S:    Orphan
  L:    [email protected]
  L:    [email protected]
 -S:    Maintained
  F:    drivers/staging/fbtft/
  
  FC0011 TUNER DRIVER
@@@ -7570,6 -7577,14 +7569,6 @@@ S:     Supporte
  F:    drivers/infiniband/hw/i40iw/
  F:    include/uapi/rdma/i40iw-abi.h
  
 -INTEL SHA MULTIBUFFER DRIVER
 -M:    Megha Dey <[email protected]>
 -R:    Tim Chen <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    arch/x86/crypto/sha*-mb/
 -F:    crypto/mcryptd.c
 -
  INTEL TELEMETRY DRIVER
  M:    Souvik Kumar Chakravarty <[email protected]>
  L:    [email protected]
@@@ -7714,6 -7729,7 +7713,6 @@@ IPX NETWORK LAYE
  L:    [email protected]
  S:    Obsolete
  F:    include/uapi/linux/ipx.h
 -F:    drivers/staging/ipx/
  
  IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
  M:    Marc Zyngier <[email protected]>
@@@ -8148,7 -8164,6 +8147,7 @@@ F:      security/keys/encrypted-keys
  
  KEYS-TRUSTED
  M:    James Bottomley <[email protected]>
 +M:      Jarkko Sakkinen <[email protected]>
  M:    Mimi Zohar <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -8687,18 -8702,11 +8686,18 @@@ F:   drivers/message/fusion
  F:    drivers/scsi/mpt3sas/
  
  LSILOGIC/SYMBIOS/NCR 53C8XX and 53C1010 PCI-SCSI drivers
 -M:    Matthew Wilcox <[email protected]>
 +M:    Matthew Wilcox <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/scsi/sym53c8xx_2/
  
 +LTC1660 DAC DRIVER
 +M:    Marcus Folkesson <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/iio/dac/ltc1660.txt
 +F:    drivers/iio/dac/ltc1660.c
 +
  LTC4261 HARDWARE MONITOR DRIVER
  M:    Guenter Roeck <[email protected]>
  L:    [email protected]
@@@ -8863,7 -8871,7 +8862,7 @@@ S:      Maintaine
  F:    drivers/net/phy/marvell10g.c
  
  MARVELL MVNETA ETHERNET DRIVER
 -M:    Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 +M:    Thomas Petazzoni <thomas.petazzoni@bootlin.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/marvell/mvneta.*
@@@ -9062,10 -9070,11 +9061,10 @@@ F:   drivers/media/dvb-frontends/cxd2880/
  F:    drivers/media/spi/cxd2880*
  
  MEDIA DRIVERS FOR DIGITAL DEVICES PCIE DEVICES
 -M:    Daniel Scheller <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
 -S:    Maintained
 +S:    Orphan
  F:    drivers/media/pci/ddbridge/*
  
  MEDIA DRIVERS FOR FREESCALE IMX
@@@ -9080,13 -9089,6 +9079,13 @@@ F:    drivers/staging/media/imx
  F:    include/linux/imx-media.h
  F:    include/media/imx.h
  
 +MEDIA DRIVER FOR FREESCALE IMX PXP
 +M:    Philipp Zabel <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/platform/imx-pxp.[ch]
 +
  MEDIA DRIVERS FOR HELENE
  M:    Abylay Ospan <[email protected]>
  L:    [email protected]
@@@ -9117,10 -9119,11 +9116,10 @@@ S:   Supporte
  F:    drivers/media/dvb-frontends/lnbh25*
  
  MEDIA DRIVERS FOR MXL5XX TUNER DEMODULATORS
 -M:    Daniel Scheller <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
 -S:    Maintained
 +S:    Orphan
  F:    drivers/media/dvb-frontends/mxl5xx*
  
  MEDIA DRIVERS FOR NETUP PCI UNIVERSAL DVB devices
@@@ -9163,7 -9166,7 +9162,7 @@@ F:      drivers/media/platform/rcar-fcp.
  F:    include/media/rcar-fcp.h
  
  MEDIA DRIVERS FOR RENESAS - FDP1
 -M:    Kieran Bingham <kieran@bingham.xyz>
 +M:    Kieran Bingham <kieran[email protected]>
  L:    [email protected]
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
@@@ -9183,7 -9186,6 +9182,7 @@@ F:      drivers/media/platform/rcar-vin
  
  MEDIA DRIVERS FOR RENESAS - VSP1
  M:    Laurent Pinchart <[email protected]>
 +M:    Kieran Bingham <[email protected]>
  L:    [email protected]
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
@@@ -9192,17 -9194,19 +9191,17 @@@ F:   Documentation/devicetree/bindings/me
  F:    drivers/media/platform/vsp1/
  
  MEDIA DRIVERS FOR ST STV0910 DEMODULATOR ICs
 -M:    Daniel Scheller <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
 -S:    Maintained
 +S:    Orphan
  F:    drivers/media/dvb-frontends/stv0910*
  
  MEDIA DRIVERS FOR ST STV6111 TUNER ICs
 -M:    Daniel Scheller <[email protected]>
  L:    [email protected]
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
 -S:    Maintained
 +S:    Orphan
  F:    drivers/media/dvb-frontends/stv6111*
  
  MEDIA DRIVERS FOR STM32 - DCMI
@@@ -9569,7 -9573,7 +9568,7 @@@ MEN Z069 WATCHDOG DRIVE
  M:    Johannes Thumshirn <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/watchdog/menz069_wdt.c
 +F:    drivers/watchdog/menz69_wdt.c
  
  MESON AO CEC DRIVER FOR AMLOGIC SOCS
  M:    Neil Armstrong <[email protected]>
@@@ -9588,20 -9592,14 +9587,20 @@@ T:   git git://git.monstr.eu/linux-2.6-mi
  S:    Supported
  F:    arch/microblaze/
  
 -MICROCHIP / ATMEL AT91 SERIAL DRIVER
 +MICROCHIP AT91 SERIAL DRIVER
  M:    Richard Genoud <[email protected]>
  S:    Maintained
  F:    drivers/tty/serial/atmel_serial.c
  F:    drivers/tty/serial/atmel_serial.h
  F:    Documentation/devicetree/bindings/mfd/atmel-usart.txt
  
 -MICROCHIP / ATMEL DMA DRIVER
 +MICROCHIP AUDIO ASOC DRIVERS
 +M:    Codrin Ciubotariu <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    sound/soc/atmel
 +
 +MICROCHIP DMA DRIVER
  M:    Ludovic Desroches <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
@@@ -9609,35 -9607,27 +9608,35 @@@ S:   Supporte
  F:    drivers/dma/at_hdmac.c
  F:    drivers/dma/at_hdmac_regs.h
  F:    include/linux/platform_data/dma-atmel.h
 +F:    Documentation/devicetree/bindings/dma/atmel-dma.txt
 +F:    include/dt-bindings/dma/at91.h
  
 -MICROCHIP / ATMEL ECC DRIVER
 +MICROCHIP ECC DRIVER
  M:    Tudor Ambarus <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/crypto/atmel-ecc.*
  
 -MICROCHIP / ATMEL ISC DRIVER
 -M:    Songjun Wu <[email protected]>
 +MICROCHIP I2C DRIVER
 +M:    Ludovic Desroches <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/i2c/busses/i2c-at91.c
 +
 +MICROCHIP ISC DRIVER
 +M:    Eugen Hristev <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/media/platform/atmel/atmel-isc.c
  F:    drivers/media/platform/atmel/atmel-isc-regs.h
  F:    devicetree/bindings/media/atmel-isc.txt
  
 -MICROCHIP / ATMEL NAND DRIVER
 -M:    Josh Wu <rainyfeeling@outlook.com>
 -L:    linux-m[email protected].org
 +MICROCHIP ISI DRIVER
 +M:    Eugen Hristev <eugen.hristev@microchip.com>
 +L:    linux-m[email protected].org
  S:    Supported
 -F:    drivers/mtd/nand/raw/atmel/*
 -F:    Documentation/devicetree/bindings/mtd/atmel-nand.txt
 +F:    drivers/media/platform/atmel/atmel-isi.c
 +F:    include/media/atmel-isi.h
  
  MICROCHIP AT91 USART MFD DRIVER
  M:    Radu Pirea <[email protected]>
@@@ -9671,80 -9661,6 +9670,80 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/microchip/lan743x_*
  
 +MICROCHIP LCDFB DRIVER
 +M:    Nicolas Ferre <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/video/fbdev/atmel_lcdfb.c
 +F:    include/video/atmel_lcdc.h
 +
 +MICROCHIP MMC/SD/SDIO MCI DRIVER
 +M:    Ludovic Desroches <[email protected]>
 +S:    Maintained
 +F:    drivers/mmc/host/atmel-mci.c
 +
 +MICROCHIP MCP3911 ADC DRIVER
 +M:    Marcus Folkesson <[email protected]>
 +M:    Kent Gustavsson <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/iio/adc/mcp3911.c
 +F:    Documentation/devicetree/bindings/iio/adc/mcp3911.txt
 +
 +MICROCHIP NAND DRIVER
 +M:    Tudor Ambarus <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/mtd/nand/raw/atmel/*
 +F:    Documentation/devicetree/bindings/mtd/atmel-nand.txt
 +
 +MICROCHIP PWM DRIVER
 +M:    Claudiu Beznea <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/pwm/pwm-atmel.c
 +F:    Documentation/devicetree/bindings/pwm/atmel-pwm.txt
 +
 +MICROCHIP SAMA5D2-COMPATIBLE ADC DRIVER
 +M:    Ludovic Desroches <[email protected]>
 +M:    Eugen Hristev <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/iio/adc/at91-sama5d2_adc.c
 +F:    Documentation/devicetree/bindings/iio/adc/at91-sama5d2_adc.txt
 +F:    include/dt-bindings/iio/adc/at91-sama5d2_adc.h
 +
 +MICROCHIP SAMA5D2-COMPATIBLE SHUTDOWN CONTROLLER
 +M:    Nicolas Ferre <[email protected]>
 +S:    Supported
 +F:    drivers/power/reset/at91-sama5d2_shdwc.c
 +
 +MICROCHIP SPI DRIVER
 +M:    Nicolas Ferre <[email protected]>
 +S:    Supported
 +F:    drivers/spi/spi-atmel.*
 +
 +MICROCHIP SSC DRIVER
 +M:    Nicolas Ferre <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    drivers/misc/atmel-ssc.c
 +F:    include/linux/atmel-ssc.h
 +
 +MICROCHIP TIMER COUNTER (TC) AND CLOCKSOURCE DRIVERS
 +M:    Nicolas Ferre <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    drivers/misc/atmel_tclib.c
 +F:    drivers/clocksource/tcb_clksrc.c
 +
 +MICROCHIP USBA UDC DRIVER
 +M:    Cristian Birsan <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    drivers/usb/gadget/udc/atmel_usba_udc.*
 +
  MICROCHIP USB251XB DRIVER
  M:    Richard Leitner <[email protected]>
  L:    [email protected]
@@@ -9752,13 -9668,6 +9751,13 @@@ S:    Maintaine
  F:    drivers/usb/misc/usb251xb.c
  F:    Documentation/devicetree/bindings/usb/usb251xb.txt
  
 +MICROCHIP XDMA DRIVER
 +M:    Ludovic Desroches <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/dma/at_xdmac.c
 +
  MICROSEMI MIPS SOCS
  M:    Alexandre Belloni <[email protected]>
  L:    [email protected]
@@@ -10097,19 -10006,9 +10096,19 @@@ F: drivers/media/tuners/mxl5007t.
  
  MXSFB DRM DRIVER
  M:    Marek Vasut <[email protected]>
 +M:    Stefan Agner <[email protected]>
 +L:    [email protected]
  S:    Supported
  F:    drivers/gpu/drm/mxsfb/
  F:    Documentation/devicetree/bindings/display/mxsfb.txt
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +
 +MYLEX DAC960 PCI RAID Controller
 +M:    Hannes Reinecke <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/scsi/myrb.*
 +F:    drivers/scsi/myrs.*
  
  MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
  M:    Chris Lee <[email protected]>
@@@ -10142,6 -10041,11 +10141,6 @@@ NATSEMI ETHERNET DRIVER (DP8381x
  S:    Orphan
  F:    drivers/net/ethernet/natsemi/natsemi.c
  
 -NCP FILESYSTEM
 -M:    Petr Vandrovec <[email protected]>
 -S:    Obsolete
 -F:    drivers/staging/ncpfs/
 -
  NCR 5380 SCSI DRIVERS
  M:    Finn Thain <[email protected]>
  M:    Michael Schmitz <[email protected]>
@@@ -11242,7 -11146,7 +11241,7 @@@ S:   Maintaine
  F:    drivers/firmware/pcdp.*
  
  PCI DRIVER FOR AARDVARK (Marvell Armada 3700)
 -M:    Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 +M:    Thomas Petazzoni <thomas.petazzoni@bootlin.com>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -11274,7 -11178,7 +11273,7 @@@ F:   Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/pci-versatile.c
  
  PCI DRIVER FOR ARMADA 8K
 -M:    Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 +M:    Thomas Petazzoni <thomas.petazzoni@bootlin.com>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -11343,7 -11247,7 +11342,7 @@@ F:   Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/pcie-mobiveil.c
  
  PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)
 -M:    Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 +M:    Thomas Petazzoni <thomas.petazzoni@bootlin.com>
  M:    Jason Cooper <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
@@@ -12609,12 -12513,6 +12608,12 @@@ S: Supporte
  F:    drivers/i2c/busses/i2c-rcar.c
  F:    drivers/i2c/busses/i2c-sh_mobile.c
  
 +RENESAS RIIC DRIVER
 +M:    Chris Brandt <[email protected]>
 +S:    Supported
 +F:    Documentation/devicetree/bindings/i2c/i2c-riic.txt
 +F:    drivers/i2c/busses/i2c-riic.c
 +
  RENESAS USB PHY DRIVER
  M:    Yoshihiro Shimoda <[email protected]>
  L:    [email protected]
@@@ -12901,18 -12799,6 +12900,18 @@@ W: http://www.ibm.com/developerworks/li
  S:    Supported
  F:    drivers/s390/crypto/
  
 +S390 VFIO AP DRIVER
 +M:    Tony Krowiak <[email protected]>
 +M:    Pierre Morel <[email protected]>
 +M:    Halil Pasic <[email protected]>
 +L:    [email protected]
 +W:    http://www.ibm.com/developerworks/linux/linux390/
 +S:    Supported
 +F:    drivers/s390/crypto/vfio_ap_drv.c
 +F:    drivers/s390/crypto/vfio_ap_private.h
 +F:    drivers/s390/crypto/vfio_ap_ops.c
 +F:    Documentation/s390/vfio-ap.txt
 +
  S390 ZFCP DRIVER
  M:    Steffen Maier <[email protected]>
  M:    Benjamin Block <[email protected]>
@@@ -13254,12 -13140,6 +13253,12 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/mmc/host/sdhci-pci-dwc-mshc.c
  
 +SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) MICROCHIP DRIVER
 +M:    Ludovic Desroches <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/mmc/host/sdhci-of-at91.c
 +
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) SAMSUNG DRIVER
  M:    Ben Dooks <[email protected]>
  M:    Jaehoon Chung <[email protected]>
@@@ -13798,20 -13678,6 +13797,20 @@@ S: Maintaine
  F:    drivers/media/i2c/imx274.c
  F:    Documentation/devicetree/bindings/media/i2c/imx274.txt
  
 +SONY IMX319 SENSOR DRIVER
 +M:    Bingbu Cao <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/imx319.c
 +
 +SONY IMX355 SENSOR DRIVER
 +M:    Tianshu Qiu <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/imx355.c
 +
  SONY MEMORYSTICK CARD SUPPORT
  M:    Alex Dubov <[email protected]>
  W:    http://tifmxx.berlios.de/
@@@ -13878,7 -13744,7 +13877,7 @@@ F:   sound/soc
  F:    include/sound/soc*
  
  SOUNDWIRE SUBSYSTEM
 -M:    Vinod Koul <v[email protected]>
 +M:    Vinod Koul <v[email protected]>
  M:    Sanyog Kale <[email protected]>
  R:    Pierre-Louis Bossart <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -14014,13 -13880,6 +14013,13 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/i2c/busses/i2c-stm32*
  
 +ST VL53L0X ToF RANGER(I2C) IIO DRIVER
 +M:    Song Qiang <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/iio/proximity/vl53l0x-i2c.c
 +F:    Documentation/devicetree/bindings/iio/proximity/vl53l0x.txt
 +
  STABLE BRANCH
  M:    Greg Kroah-Hartman <[email protected]>
  L:    [email protected]
@@@ -14040,6 -13899,11 +14039,6 @@@ L:  [email protected]
  S:    Maintained
  F:    drivers/staging/erofs/
  
 -STAGING - FLARION FT1000 DRIVERS
 -M:    Marek Belisko <[email protected]>
 -S:    Odd Fixes
 -F:    drivers/staging/ft1000/
 -
  STAGING - INDUSTRIAL IO
  M:    Jonathan Cameron <[email protected]>
  L:    [email protected]
@@@ -14131,7 -13995,7 +14130,7 @@@ F:   sound/soc/sti
  STI CEC DRIVER
  M:    Benjamin Gaignard <[email protected]>
  S:    Maintained
 -F:    drivers/staging/media/st-cec/
 +F:    drivers/media/platform/sti/cec/
  F:    Documentation/devicetree/bindings/media/stih-cec.txt
  
  STK1160 USB VIDEO CAPTURE DRIVER
@@@ -14683,6 -14547,7 +14682,6 @@@ F:   Documentation/devicetree/bindings/ar
  F:    drivers/firmware/ti_sci*
  F:    include/linux/soc/ti/ti_sci_protocol.h
  F:    Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
 -F:    include/dt-bindings/genpd/k2g.h
  F:    drivers/soc/ti/ti_sci_pm_domains.c
  F:    Documentation/devicetree/bindings/reset/ti,sci-reset.txt
  F:    Documentation/devicetree/bindings/clock/ti,sci-clk.txt
@@@ -14886,13 -14751,6 +14885,13 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/ti/netcp*
  
 +TI PCM3060 ASoC CODEC DRIVER
 +M:    Kirill Marinushkin <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/sound/pcm3060.txt
 +F:    sound/soc/codecs/pcm3060*
 +
  TI TAS571X FAMILY ASoC CODEC DRIVER
  M:    Kevin Cernekee <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -15565,12 -15423,6 +15564,12 @@@ F: Documentation/driver-api/usb/typec_b
  F:    drivers/usb/typec/altmodes/
  F:    include/linux/usb/typec_altmode.h
  
 +USB TYPEC PORT CONTROLLER DRIVERS
 +M:    Guenter Roeck <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/usb/typec/tcpm/
 +
  USB UHCI DRIVER
  M:    Alan Stern <[email protected]>
  L:    [email protected]
@@@ -15645,27 -15497,13 +15644,27 @@@ F:        arch/x86/um
  F:    fs/hostfs/
  F:    fs/hppfs/
  
 +USERSPACE COPYIN/COPYOUT (UIOVEC)
 +M:    Alexander Viro <[email protected]>
 +S:    Maintained
 +F:    lib/iov_iter.c
 +F:    include/linux/uio.h
 +
 +USERSPACE DMA BUFFER DRIVER
 +M:    Gerd Hoffmann <[email protected]>
 +S:    Maintained
 +L:    [email protected]
 +F:    drivers/dma-buf/udmabuf.c
 +F:    include/uapi/linux/udmabuf.h
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +
  USERSPACE I/O (UIO)
  M:    Greg Kroah-Hartman <[email protected]>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
  F:    Documentation/driver-api/uio-howto.rst
  F:    drivers/uio/
 -F:    include/linux/uio*.h
 +F:    include/linux/uio_driver.h
  
  UTIL-LINUX PACKAGE
  M:    Karel Zak <[email protected]>
@@@ -15789,7 -15627,7 +15788,7 @@@ M:   Marek Szyprowski <m.szyprowski@samsu
  M:    Kyungmin Park <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/media/v4l2-core/videobuf2-*
 +F:    drivers/media/common/videobuf2/*
  F:    include/media/videobuf2-*
  
  VIMC VIRTUAL MEDIA CONTROLLER DRIVER
@@@ -16266,17 -16104,6 +16265,17 @@@ T: git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    arch/x86/entry/vdso/
  
 +XARRAY
 +M:    Matthew Wilcox <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/core-api/xarray.rst
 +F:    lib/idr.c
 +F:    lib/xarray.c
 +F:    include/linux/idr.h
 +F:    include/linux/xarray.h
 +F:    tools/testing/radix-tree
 +
  XC2028/3028 TUNER DRIVER
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]

diff --combined drivers/cpuidle/governors/menu.c
index 71979605246eebd1f9690c06f089dab31cd05c89,76df4f947f079156f09d7f2a858055a02c12e356..61316fc51548a1c72bcf86e1a2ae54b070491b16
--- 1/drivers/cpuidle/governors/menu.c
--- 2/drivers/cpuidle/governors/menu.c
+++ b/drivers/cpuidle/governors/menu.c
@@@ -130,11 -130,10 +130,6 @@@ struct menu_device 
        int             interval_ptr;
  };
  
- static inline int get_loadavg(unsigned long load)
- {
-       return LOAD_INT(load) * 10 + LOAD_FRAC(load) / 10;
- }
 -
 -#define LOAD_INT(x) ((x) >> FSHIFT)
 -#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
--
  static inline int which_bucket(unsigned int duration, unsigned long nr_iowaiters)
  {
        int bucket = 0;
@@@ -168,18 -167,10 +163,10 @@@
   * to be, the higher this multiplier, and thus the higher
   * the barrier to go to an expensive C state.
   */
- static inline int performance_multiplier(unsigned long nr_iowaiters, unsigned long load)
+ static inline int performance_multiplier(unsigned long nr_iowaiters)
  {
-       int mult = 1;
- 
-       /* for higher loadavg, we are more reluctant */
- 
-       mult += 2 * get_loadavg(load);
- 
-       /* for IO wait tasks (per cpu!) we add 5x each */
-       mult += 10 * nr_iowaiters;
- 
-       return mult;
+       /* for IO wait tasks (per cpu!) we add 10x each */
+       return 1 + 10 * nr_iowaiters;
  }
  
  static DEFINE_PER_CPU(struct menu_device, menu_devices);
@@@ -297,7 -288,7 +284,7 @@@ static int menu_select(struct cpuidle_d
        int idx;
        unsigned int interactivity_req;
        unsigned int predicted_us;
-       unsigned long nr_iowaiters, cpu_load;
+       unsigned long nr_iowaiters;
        ktime_t delta_next;
  
        if (data->needs_update) {
@@@ -308,7 -299,7 +295,7 @@@
        /* determine the expected residency time, round up */
        data->next_timer_us = ktime_to_us(tick_nohz_get_sleep_length(&delta_next));
  
-       get_iowait_load(&nr_iowaiters, &cpu_load);
+       nr_iowaiters = nr_iowait_cpu(dev->cpu);
        data->bucket = which_bucket(data->next_timer_us, nr_iowaiters);
  
        if (unlikely(drv->state_count <= 1 || latency_req == 0) ||
@@@ -352,7 -343,7 +339,7 @@@
                 * Use the performance multiplier and the user-configurable
                 * latency_req to determine the maximum exit latency.
                 */
-               interactivity_req = predicted_us / performance_multiplier(nr_iowaiters, cpu_load);
+               interactivity_req = predicted_us / performance_multiplier(nr_iowaiters);
                if (latency_req > interactivity_req)
                        latency_req = interactivity_req;
        }

diff --combined kernel/sched/core.c
index fd2fce8a001be7375d4064de04dab71ac7eab307,c8d5c279be14818ac3a3a543bb9d8d1dff3e3459..f12225f26b70a630ac185cfccba2b140f191c47e
--- 1/kernel/sched/core.c
--- 2/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@@ -722,10 -722,8 +722,10 @@@ static inline void enqueue_task(struct 
        if (!(flags & ENQUEUE_NOCLOCK))
                update_rq_clock(rq);
  
 -      if (!(flags & ENQUEUE_RESTORE))
 +      if (!(flags & ENQUEUE_RESTORE)) {
                sched_info_queued(rq, p);
 +              psi_enqueue(p, flags & ENQUEUE_WAKEUP);
 +      }
  
        p->sched_class->enqueue_task(rq, p, flags);
  }
@@@ -735,10 -733,8 +735,10 @@@ static inline void dequeue_task(struct 
        if (!(flags & DEQUEUE_NOCLOCK))
                update_rq_clock(rq);
  
 -      if (!(flags & DEQUEUE_SAVE))
 +      if (!(flags & DEQUEUE_SAVE)) {
                sched_info_dequeued(rq, p);
 +              psi_dequeue(p, flags & DEQUEUE_SLEEP);
 +      }
  
        p->sched_class->dequeue_task(rq, p, flags);
  }
@@@ -2041,7 -2037,6 +2041,7 @@@ try_to_wake_up(struct task_struct *p, u
        cpu = select_task_rq(p, p->wake_cpu, SD_BALANCE_WAKE, wake_flags);
        if (task_cpu(p) != cpu) {
                wake_flags |= WF_MIGRATED;
 +              psi_ttwu_dequeue(p);
                set_task_cpu(p, cpu);
        }
  
@@@ -2880,6 -2875,18 +2880,18 @@@ unsigned long long nr_context_switches(
        return sum;
  }
  
+ /*
+  * Consumers of these two interfaces, like for example the cpuidle menu
+  * governor, are using nonsensical data. Preferring shallow idle state selection
+  * for a CPU that has IO-wait which might not even end up running the task when
+  * it does become runnable.
+  */
+ 
+ unsigned long nr_iowait_cpu(int cpu)
+ {
+       return atomic_read(&cpu_rq(cpu)->nr_iowait);
+ }
+ 
  /*
   * IO-wait accounting, and how its mostly bollocks (on SMP).
   *
@@@ -2915,31 -2922,11 +2927,11 @@@ unsigned long nr_iowait(void
        unsigned long i, sum = 0;
  
        for_each_possible_cpu(i)
-               sum += atomic_read(&cpu_rq(i)->nr_iowait);
+               sum += nr_iowait_cpu(i);
  
        return sum;
  }
  
- /*
-  * Consumers of these two interfaces, like for example the cpuidle menu
-  * governor, are using nonsensical data. Preferring shallow idle state selection
-  * for a CPU that has IO-wait which might not even end up running the task when
-  * it does become runnable.
-  */
- 
- unsigned long nr_iowait_cpu(int cpu)
- {
-       struct rq *this = cpu_rq(cpu);
-       return atomic_read(&this->nr_iowait);
- }
- 
- void get_iowait_load(unsigned long *nr_waiters, unsigned long *load)
- {
-       struct rq *rq = this_rq();
-       *nr_waiters = atomic_read(&rq->nr_iowait);
-       *load = rq->load.weight;
- }
- 
  #ifdef CONFIG_SMP
  
  /*
@@@ -3056,7 -3043,6 +3048,7 @@@ void scheduler_tick(void
        curr->sched_class->task_tick(rq, curr, 0);
        cpu_load_update_active(rq);
        calc_global_load_tick(rq);
 +      psi_task_tick(rq);
  
        rq_unlock(rq, &rf);
  
@@@ -4939,7 -4925,9 +4931,7 @@@ static void do_sched_yield(void
        struct rq_flags rf;
        struct rq *rq;
  
 -      local_irq_disable();
 -      rq = this_rq();
 -      rq_lock(rq, &rf);
 +      rq = this_rq_lock_irq(&rf);
  
        schedstat_inc(rq->yld_count);
        current->sched_class->yield_task(rq);
@@@ -5248,7 -5236,7 +5240,7 @@@ out_unlock
   * an error code.
   */
  SYSCALL_DEFINE2(sched_rr_get_interval, pid_t, pid,
 -              struct timespec __user *, interval)
 +              struct __kernel_timespec __user *, interval)
  {
        struct timespec64 t;
        int retval = sched_rr_get_interval(pid, &t);
@@@ -5259,16 -5247,16 +5251,16 @@@
        return retval;
  }
  
 -#ifdef CONFIG_COMPAT
 +#ifdef CONFIG_COMPAT_32BIT_TIME
  COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval,
                       compat_pid_t, pid,
 -                     struct compat_timespec __user *, interval)
 +                     struct old_timespec32 __user *, interval)
  {
        struct timespec64 t;
        int retval = sched_rr_get_interval(pid, &t);
  
        if (retval == 0)
 -              retval = compat_put_timespec64(&t, interval);
 +              retval = put_old_timespec32(&t, interval);
        return retval;
  }
  #endif
@@@ -6073,8 -6061,6 +6065,8 @@@ void __init sched_init(void
  
        init_schedstats();
  
 +      psi_init();
 +
        scheduler_running = 1;
  }