]> Git Repo - linux.git/commitdiff
Merge tag 'pm-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
authorLinus Torvalds <[email protected]>
Sun, 21 Feb 2021 05:42:18 +0000 (21:42 -0800)
committerLinus Torvalds <[email protected]>
Sun, 21 Feb 2021 05:42:18 +0000 (21:42 -0800)
Pull power management updates from Rafael Wysocki:
 "These add a new power capping facility allowing aggregate power
  constraints to be applied to sets of devices in a distributed manner,
  add a new CPU ID to the RAPL power capping driver and improve it, drop
  a cpufreq driver belonging to a platform that is not supported any
  more, drop two redundant cpufreq driver flags, update cpufreq drivers
  (intel_pstate, brcmstb-avs, qcom-hw), update the operating performance
  points (OPP) framework (code cleanups, new helpers, devfreq-related
  modifications), clean up devfreq, extend the PM clock layer, update
  the cpupower utility and make assorted janitorial changes.

  Specifics:

   - Add new power capping facility called DTPM (Dynamic Thermal Power
     Management), based on the existing power capping framework, to
     allow aggregate power constraints to be applied to sets of devices
     in a distributed manner, along with a CPU backend driver based on
     the Energy Model (Daniel Lezcano, Dan Carpenter, Colin Ian King).

   - Add AlderLake Mobile support to the Intel RAPL power capping driver
     and make it use the topology interface when laying out the system
     topology (Zhang Rui, Yunfeng Ye).

   - Drop the cpufreq tango driver belonging to a platform that is not
     supported any more (Arnd Bergmann).

   - Drop the redundant CPUFREQ_STICKY and CPUFREQ_PM_NO_WARN cpufreq
     driver flags (Viresh Kumar).

   - Update cpufreq drivers:

      * Fix max CPU frequency discovery in the intel_pstate driver and
        make janitorial changes in it (Chen Yu, Rafael Wysocki, Nigel
        Christian).

      * Fix resource leaks in the brcmstb-avs-cpufreq driver (Christophe
        JAILLET).

      * Make the tegra20 driver use the resource-managed API (Dmitry
        Osipenko).

      * Enable boost support in the qcom-hw driver (Shawn Guo).

   - Update the operating performance points (OPP) framework:

      * Clean up the OPP core (Dmitry Osipenko, Viresh Kumar).

      * Extend the OPP API by adding new helpers to it (Dmitry Osipenko,
        Viresh Kumar).

      * Allow required OPPs to be used for devfreq devices and update
        the devfreq governor code accordingly (Saravana Kannan).

      * Prepare the framework for introducing new dev_pm_opp_set_opp()
        helper (Viresh Kumar).

      * Drop dev_pm_opp_set_bw() and update related drivers (Viresh
        Kumar).

      * Allow lazy linking of required-OPPs (Viresh Kumar).

   - Simplify and clean up devfreq somewhat (Lukasz Luba, Yang Li,
     Pierre Kuo).

   - Update the generic power domains (genpd) framework:

      * Use device's next wakeup to determine domain idle state (Lina
        Iyer).

      * Improve initialization and debug (Dmitry Osipenko).

      * Simplify computations (Abaci Team).

   - Make janitorial changes in the core code handling system sleep and
     PM-runtime (Bhaskar Chowdhury, Bjorn Helgaas, Rikard Falkeborn,
     Zqiang).

   - Update the MAINTAINERS entry for the exynos cpuidle driver and drop
     DEBUG definition from intel_idle (Krzysztof Kozlowski, Tom Rix).

   - Extend the PM clock layer to cover clocks that must sleep (Nicolas
     Pitre).

   - Update the cpupower utility:

      * Update cpupower command, add support for AMD family 0x19 and
        clean up the code to remove many of the family checks to make
        future family updates easier (Nathan Fontenot, Robert Richter).

      * Add Makefile dependencies for install targets to allow building
        cpupower in parallel rather than serially (Ivan Babrou).

   - Make janitorial changes in power management Kconfig (Lukasz Luba)"

* tag 'pm-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (89 commits)
  MAINTAINERS: cpuidle: exynos: include header in file pattern
  powercap: intel_rapl: Use topology interface in rapl_init_domains()
  powercap: intel_rapl: Use topology interface in rapl_add_package()
  PM: sleep: Constify static struct attribute_group
  PM: Kconfig: remove unneeded "default n" options
  PM: EM: update Kconfig description and drop "default n" option
  cpufreq: Remove unused flag CPUFREQ_PM_NO_WARN
  cpufreq: Remove CPUFREQ_STICKY flag
  PM / devfreq: Add required OPPs support to passive governor
  PM / devfreq: Cache OPP table reference in devfreq
  OPP: Add function to look up required OPP's for a given OPP
  PM / devfreq: rk3399_dmc: Remove unneeded semicolon
  opp: Replace ENOTSUPP with EOPNOTSUPP
  opp: Fix "foo * bar" should be "foo *bar"
  opp: Don't ignore clk_get() errors other than -ENOENT
  opp: Update bandwidth requirements based on scaling up/down
  opp: Allow lazy-linking of required-opps
  opp: Remove dev_pm_opp_set_bw()
  devfreq: tegra30: Migrate to dev_pm_opp_set_opp()
  drm: msm: Migrate to dev_pm_opp_set_opp()
  ...

1  2 
MAINTAINERS
include/asm-generic/vmlinux.lds.h

diff --combined MAINTAINERS
index b78a4e585c49a463c48c0b0ddfb92a899a9dd133,186a15d6f20594d6189bdb10ac0b096b69124a95..c113989c5cec067bf309d2cf05227aa26e244ef5
@@@ -1511,7 -1511,6 +1511,7 @@@ ARM/ACTIONS SEMI ARCHITECTUR
  M:    Andreas Färber <[email protected]>
  M:    Manivannan Sadhasivam <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/actions.yaml
  F:    Documentation/devicetree/bindings/clock/actions,owl-cmu.txt
@@@ -1779,6 -1778,19 +1779,6 @@@ F:     drivers/net/ethernet/cortina
  F:    drivers/pinctrl/pinctrl-gemini.c
  F:    drivers/rtc/rtc-ftrtc010.c
  
 -ARM/CSR SIRFPRIMA2 MACHINE SUPPORT
 -M:    Barry Song <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux.git
 -F:    arch/arm/boot/dts/prima2*
 -F:    arch/arm/mach-prima2/
 -F:    drivers/clk/sirf/
 -F:    drivers/clocksource/timer-atlas7.c
 -F:    drivers/clocksource/timer-prima2.c
 -X:    drivers/gnss
 -N:    [^a-z]sirf
 -
  ARM/CZ.NIC TURRIS MOX SUPPORT
  M:    Marek Behun <[email protected]>
  S:    Maintained
@@@ -1794,6 -1806,13 +1794,6 @@@ F:     drivers/firmware/turris-mox-rwtm.
  F:    drivers/gpio/gpio-moxtet.c
  F:    include/linux/moxtet.h
  
 -ARM/ENERGY MICRO (SILICON LABS) EFM32 SUPPORT
 -M:    Uwe Kleine-König <[email protected]>
 -R:    Pengutronix Kernel Team <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -N:    efm32
 -
  ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
  M:    Robert Jarzmik <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2071,7 -2090,7 +2071,7 @@@ M:      Chunfeng Yun <chunfeng.yun@mediatek.
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -F:    Documentation/devicetree/bindings/phy/phy-mtk-*
 +F:    Documentation/devicetree/bindings/phy/mediatek,*
  F:    drivers/phy/mediatek/
  
  ARM/Microchip (AT91) SoC support
@@@ -2136,7 -2155,7 +2136,7 @@@ ARM/NEC MOBILEPRO 900/c MACHINE SUPPOR
  M:    Michael Petchkovsky <[email protected]>
  S:    Maintained
  
 -ARM/NOMADIK/U300/Ux500 ARCHITECTURES
 +ARM/NOMADIK/Ux500 ARCHITECTURES
  M:    Linus Walleij <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -2145,23 -2164,35 +2145,23 @@@ F:   Documentation/devicetree/bindings/ar
  F:    Documentation/devicetree/bindings/arm/ux500.yaml
  F:    Documentation/devicetree/bindings/arm/ux500/
  F:    Documentation/devicetree/bindings/i2c/i2c-nomadik.txt
 -F:    Documentation/devicetree/bindings/i2c/i2c-stu300.txt
  F:    arch/arm/boot/dts/ste-*
  F:    arch/arm/mach-nomadik/
 -F:    arch/arm/mach-u300/
  F:    arch/arm/mach-ux500/
  F:    drivers/clk/clk-nomadik.c
 -F:    drivers/clk/clk-u300.c
  F:    drivers/clocksource/clksrc-dbx500-prcmu.c
 -F:    drivers/clocksource/timer-u300.c
 -F:    drivers/dma/coh901318*
  F:    drivers/dma/ste_dma40*
  F:    drivers/hwspinlock/u8500_hsem.c
  F:    drivers/i2c/busses/i2c-nomadik.c
 -F:    drivers/i2c/busses/i2c-stu300.c
  F:    drivers/iio/adc/ab8500-gpadc.c
 -F:    drivers/mfd/ab3100*
  F:    drivers/mfd/ab8500*
  F:    drivers/mfd/abx500*
  F:    drivers/mfd/db8500*
  F:    drivers/mfd/dbx500*
  F:    drivers/pinctrl/nomadik/
 -F:    drivers/pinctrl/pinctrl-coh901*
 -F:    drivers/pinctrl/pinctrl-u300.c
 -F:    drivers/rtc/rtc-ab3100.c
  F:    drivers/rtc/rtc-ab8500.c
 -F:    drivers/rtc/rtc-coh901331.c
  F:    drivers/rtc/rtc-pl031.c
  F:    drivers/soc/ux500/
 -F:    drivers/watchdog/coh901327_wdt.c
  
  ARM/NUVOTON NPCM ARCHITECTURE
  M:    Avi Fishman <[email protected]>
@@@ -2383,8 -2414,6 +2383,8 @@@ F:      drivers/*/*s5pv210
  F:    drivers/memory/samsung/
  F:    drivers/soc/samsung/
  F:    drivers/tty/serial/samsung*
 +F:    include/linux/platform_data/*s3c*
 +F:    include/linux/serial_s3c.h
  F:    include/linux/soc/samsung/
  N:    exynos
  N:    s3c2410
@@@ -2528,6 -2557,13 +2528,6 @@@ F:     arch/arm/boot/dts/berlin
  F:    arch/arm/mach-berlin/
  F:    arch/arm64/boot/dts/synaptics/
  
 -ARM/TANGO ARCHITECTURE
 -M:    Marc Gonzalez <[email protected]>
 -M:    Mans Rullgard <[email protected]>
 -L:    [email protected]
 -S:    Odd Fixes
 -N:    tango
 -
  ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/iwamatsu/linux-visconti.git
  F:    Documentation/devicetree/bindings/arm/toshiba.yaml
 +F:    Documentation/devicetree/bindings/net/toshiba,visconti-dwmac.yaml
  F:    Documentation/devicetree/bindings/pinctrl/toshiba,tmpv7700-pinctrl.yaml
 +F:    Documentation/devicetree/bindings/watchdog/toshiba,visconti-wdt.yaml
  F:    arch/arm64/boot/dts/toshiba/
 +F:    drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c
  F:    drivers/pinctrl/visconti/
 +F:    drivers/watchdog/visconti_wdt.c
  N:    visconti
  
  ARM/UNIPHIER ARCHITECTURE
@@@ -2691,6 -2723,40 +2691,6 @@@ S:     Maintaine
  F:    arch/arm/mach-pxa/include/mach/z2.h
  F:    arch/arm/mach-pxa/z2.c
  
 -ARM/ZTE ARCHITECTURE
 -M:    Jun Nie <[email protected]>
 -M:    Shawn Guo <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -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
 -F:    Documentation/devicetree/bindings/i2c/i2c-zx2967.txt
 -F:    Documentation/devicetree/bindings/mmc/zx-dw-mshc.txt
 -F:    Documentation/devicetree/bindings/pinctrl/pinctrl-zx.txt
 -F:    Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt
 -F:    Documentation/devicetree/bindings/soc/zte/
 -F:    Documentation/devicetree/bindings/sound/zte,*.txt
 -F:    Documentation/devicetree/bindings/thermal/zx2967-thermal.txt
 -F:    Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt
 -F:    arch/arm/boot/dts/zx2967*
 -F:    arch/arm/mach-zx/
 -F:    arch/arm64/boot/dts/zte/
 -F:    drivers/clk/zte/
 -F:    drivers/dma/zx_dma.c
 -F:    drivers/gpio/gpio-zx.c
 -F:    drivers/i2c/busses/i2c-zx2967.c
 -F:    drivers/mmc/host/dw_mmc-zx.*
 -F:    drivers/pinctrl/zte/
 -F:    drivers/soc/zte/
 -F:    drivers/thermal/zx2967_thermal.c
 -F:    drivers/watchdog/zx2967_wdt.c
 -F:    include/dt-bindings/clock/zx2967*.h
 -F:    include/dt-bindings/soc/zte,*.h
 -F:    sound/soc/codecs/zx_aud96p22.c
 -F:    sound/soc/zte/
 -
  ARM/ZYNQ ARCHITECTURE
  M:    Michal Simek <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2699,7 -2765,6 +2699,7 @@@ W:      http://wiki.xilinx.co
  T:    git https://github.com/Xilinx/linux-xlnx.git
  F:    Documentation/devicetree/bindings/i2c/cdns,i2c-r1p10.yaml
  F:    Documentation/devicetree/bindings/i2c/xlnx,xps-iic-2.00.a.yaml
 +F:    Documentation/devicetree/bindings/spi/xlnx,zynq-qspi.yaml
  F:    arch/arm/mach-zynq/
  F:    drivers/block/xsysace.c
  F:    drivers/clocksource/timer-cadence-ttc.c
@@@ -2722,14 -2787,6 +2722,14 @@@ F:    arch/arm64
  F:    tools/testing/selftests/arm64/
  X:    arch/arm64/boot/dts/
  
 +ARROW SPEEDCHIPS XRS7000 SERIES ETHERNET SWITCH DRIVER
 +M:    George McCollister <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/dsa/arrow,xrs700x.yaml
 +F:    drivers/net/dsa/xrs700x/*
 +F:    net/dsa/tag_xrs700x.c
 +
  AS3645A LED FLASH CONTROLLER DRIVER
  M:    Sakari Ailus <[email protected]>
  L:    [email protected]
@@@ -3342,7 -3399,6 +3342,7 @@@ L:      [email protected] (sub
  S:    Supported
  F:    Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml
  F:    drivers/net/dsa/b53/*
 +F:    include/linux/dsa/brcm.h
  F:    include/linux/platform_data/b53.h
  
  BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
@@@ -3380,15 -3436,6 +3380,15 @@@ F:    Documentation/devicetree/bindings/mi
  F:    arch/mips/bcm47xx/*
  F:    arch/mips/include/asm/mach-bcm47xx/*
  
 +BROADCOM BCM4908 ETHERNET DRIVER
 +M:    Rafał Miłecki <[email protected]>
 +M:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/brcm,bcm4908-enet.yaml
 +F:    drivers/net/ethernet/broadcom/bcm4908_enet.*
 +F:    drivers/net/ethernet/broadcom/unimac.h
 +
  BROADCOM BCM5301X ARM ARCHITECTURE
  M:    Hauke Mehrtens <[email protected]>
  M:    Rafał Miłecki <[email protected]>
@@@ -3577,7 -3624,6 +3577,7 @@@ S:      Supporte
  F:    Documentation/devicetree/bindings/net/brcm,bcmgenet.txt
  F:    Documentation/devicetree/bindings/net/brcm,unimac-mdio.txt
  F:    drivers/net/ethernet/broadcom/genet/
 +F:    drivers/net/ethernet/broadcom/unimac.h
  F:    drivers/net/mdio/mdio-bcm-unimac.c
  F:    include/linux/platform_data/bcmgenet.h
  F:    include/linux/platform_data/mdio-bcm-unimac.h
@@@ -3611,15 -3657,6 +3611,15 @@@ N:    bcm8831
  N:    hr2
  N:    stingray
  
 +BROADCOM IPROC GBIT ETHERNET DRIVER
 +M:    Rafał Miłecki <[email protected]>
 +M:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/brcm,amac.txt
 +F:    drivers/net/ethernet/broadcom/bgmac*
 +F:    drivers/net/ethernet/broadcom/unimac.h
 +
  BROADCOM KONA GPIO DRIVER
  M:    Ray Jui <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/firmware/broadcom/*
  
 +BROADCOM PMB (POWER MANAGEMENT BUS) DRIVER
 +M:    Rafał Miłecki <[email protected]>
 +M:    Florian Fainelli <[email protected]>
 +M:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://github.com/broadcom/stblinux.git
 +F:    drivers/soc/bcm/bcm-pmb.c
 +F:    include/dt-bindings/soc/bcm-pmb.h
 +
  BROADCOM SPECIFIC AMBA DRIVER (BCMA)
  M:    Rafał Miłecki <[email protected]>
  L:    [email protected]
@@@ -3709,7 -3736,6 +3709,7 @@@ L:      [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/broadcom/bcmsysport.*
 +F:    drivers/net/ethernet/broadcom/unimac.h
  
  BROADCOM TG3 GIGABIT ETHERNET DRIVER
  M:    Siva Reddy Kallam <[email protected]>
@@@ -3817,6 -3843,14 +3817,6 @@@ F:     drivers/irqchip/irq-csky-
  N:    csky
  K:    csky
  
 -C6X ARCHITECTURE
 -M:    Mark Salter <[email protected]>
 -M:    Aurelien Jacquiot <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -W:    http://www.linux-c6x.org/wiki/index.php/Main_Page
 -F:    arch/c6x/
 -
  CA8210 IEEE-802.15.4 RADIO DRIVER
  M:    Harry Morris <[email protected]>
  L:    [email protected]
@@@ -3855,15 -3889,6 +3855,15 @@@ S:    Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
  F:    Documentation/devicetree/bindings/usb/cdns,usb3.yaml
  F:    drivers/usb/cdns3/
 +X:    drivers/usb/cdns3/cdnsp*
 +
 +CADENCE USBSSP DRD IP DRIVER
 +M:    Pawel Laszczak <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
 +F:    drivers/usb/cdns3/
 +X:    drivers/usb/cdns3/cdns3*
  
  CADET FM/AM RADIO RECEIVER DRIVER
  M:    Hans Verkuil <[email protected]>
@@@ -3905,10 -3930,8 +3905,10 @@@ T:    git git://git.kernel.org/pub/scm/lin
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
  F:    Documentation/devicetree/bindings/net/can/
  F:    drivers/net/can/
 +F:    include/linux/can/bittiming.h
  F:    include/linux/can/dev.h
  F:    include/linux/can/led.h
 +F:    include/linux/can/length.h
  F:    include/linux/can/platform/
  F:    include/linux/can/rx-offload.h
  F:    include/uapi/linux/can/error.h
@@@ -3924,7 -3947,6 +3924,7 @@@ W:      https://github.com/linux-ca
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
  F:    Documentation/networking/can.rst
 +F:    include/linux/can/can-ml.h
  F:    include/linux/can/core.h
  F:    include/linux/can/skb.h
  F:    include/net/netns/can.h
@@@ -4446,7 -4468,7 +4446,7 @@@ F:      include/linux/console
  
  CONTROL GROUP (CGROUP)
  M:    Tejun Heo <[email protected]>
 -M:    Li Zefan <lizefan@huawei.com>
 +M:    Zefan Li <lizefan.x@bytedance.com>
  M:    Johannes Weiner <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -4470,9 -4492,11 +4470,9 @@@ F:     block/blk-throttle.
  F:    include/linux/blk-cgroup.h
  
  CONTROL GROUP - CPUSET
 -M:    Li Zefan <lizefan@huawei.com>
 +M:    Zefan Li <lizefan.x@bytedance.com>
  L:    [email protected]
  S:    Maintained
 -W:    http://www.bullopensource.org/cpuset/
 -W:    http://oss.sgi.com/projects/cpusets/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
  F:    Documentation/admin-guide/cgroup-v1/cpusets.rst
  F:    include/linux/cpuset.h
@@@ -4600,6 -4624,7 +4600,7 @@@ L:      [email protected]
  S:    Supported
  F:    arch/arm/mach-exynos/pm.c
  F:    drivers/cpuidle/cpuidle-exynos.c
+ F:    include/linux/platform_data/cpuidle-exynos.h
  
  CPUIDLE DRIVER - ARM PSCI
  M:    Lorenzo Pieralisi <[email protected]>
@@@ -6033,6 -6058,14 +6034,6 @@@ T:     git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/xlnx/
  F:    drivers/gpu/drm/xlnx/
  
 -DRM DRIVERS FOR ZTE ZX
 -M:    Shawn Guo <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -T:    git git://anongit.freedesktop.org/drm/drm-misc
 -F:    Documentation/devicetree/bindings/display/zte,vou.txt
 -F:    drivers/gpu/drm/zte/
 -
  DRM PANEL DRIVERS
  M:    Thierry Reding <[email protected]>
  R:    Sam Ravnborg <[email protected]>
@@@ -9192,11 -9225,10 +9193,11 @@@ F:   include/linux/tboot.
  
  INTEL SGX
  M:    Jarkko Sakkinen <[email protected]>
 +R:    Dave Hansen <[email protected]>
  L:    [email protected]
  S:    Supported
  Q:    https://patchwork.kernel.org/project/intel-sgx/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-sgx.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/sgx
  F:    Documentation/x86/sgx.rst
  F:    arch/x86/entry/vdso/vsgx.S
  F:    arch/x86/include/uapi/asm/sgx.h
@@@ -9528,18 -9560,16 +9529,18 @@@ F:   Documentation/hwmon/k8temp.rs
  F:    drivers/hwmon/k8temp.c
  
  KASAN
 -M:    Andrey Ryabinin <aryabinin@virtuozzo.com>
 +M:    Andrey Ryabinin <ryabinin.a.a@gmail.com>
  R:    Alexander Potapenko <[email protected]>
 +R:    Andrey Konovalov <[email protected]>
  R:    Dmitry Vyukov <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/dev-tools/kasan.rst
 -F:    arch/*/include/asm/kasan.h
 +F:    arch/*/include/asm/*kasan.h
  F:    arch/*/mm/kasan_init*
  F:    include/linux/kasan*.h
 -F:    lib/test_kasan.c
 +F:    lib/Kconfig.kasan
 +F:    lib/test_kasan*.c
  F:    mm/kasan/
  F:    scripts/Makefile.kasan
  
@@@ -9554,7 -9584,7 +9555,7 @@@ F:      scripts/kconfig
  
  KCOV
  R:    Dmitry Vyukov <[email protected]>
 -R:    Andrey Konovalov <andreyknvl@google.com>
 +R:    Andrey Konovalov <andreyknvl@gmail.com>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/dev-tools/kcov.rst
@@@ -10658,8 -10688,6 +10659,8 @@@ M:   Sunil Goutham <[email protected]
  M:    Linu Cherian <[email protected]>
  M:    Geetha sowjanya <[email protected]>
  M:    Jerin Jacob <[email protected]>
 +M:    hariprasad <[email protected]>
 +M:    Subbaraya Sundeep <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/networking/device_drivers/ethernet/marvell/octeontx2.rst
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 +F:    Documentation/devicetree/bindings/usb/mediatek,*
 +F:    drivers/usb/host/xhci-mtk*
  F:    drivers/usb/mtu3/
  
  MEGACHIPS STDPXXXX-GE-B850V3-FW LVDS/DP++ BRIDGES
@@@ -12492,14 -12518,6 +12493,14 @@@ F: include/net/nfc
  F:    include/uapi/linux/nfc.h
  F:    net/nfc/
  
 +NFC VIRTUAL NCI DEVICE DRIVER
 +M:    Bongsu Jeon <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    drivers/nfc/virtual_ncidev.c
 +F:    tools/testing/selftests/nci/
 +
  NFS, SUNRPC, AND LOCKD CLIENTS
  M:    Trond Myklebust <[email protected]>
  M:    Anna Schumaker <[email protected]>
@@@ -12811,7 -12829,6 +12812,7 @@@ F:   drivers/net/dsa/ocelot/
  F:    drivers/net/ethernet/mscc/
  F:    include/soc/mscc/ocelot*
  F:    net/dsa/tag_ocelot.c
 +F:    net/dsa/tag_ocelot_8021q.c
  F:    tools/testing/selftests/drivers/net/ocelot/*
  
  OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER
@@@ -12871,7 -12888,7 +12872,7 @@@ S:   Orpha
  F:    drivers/video/fbdev/omap/
  
  OMAP GENERAL PURPOSE MEMORY CONTROLLER SUPPORT
 -M:    Roger Quadros <rogerq@ti.com>
 +M:    Roger Quadros <rogerq@kernel.org>
  M:    Tony Lindgren <[email protected]>
  L:    [email protected]
  S:    Maintained
  S:    Maintained
  F:    drivers/hid/hid-picolcd*
  
 -PICOXCELL SUPPORT
 -M:    Jamie Iles <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Supported
 -T:    git git://github.com/jamieiles/linux-2.6-ji.git
 -F:    arch/arm/boot/dts/picoxcell*
 -F:    arch/arm/mach-picoxcell/
 -F:    drivers/crypto/picoxcell*
 -
  PIDFD API
  M:    Christian Brauner <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/staging/qlge/
  
 +QLOGIC QLGE 10Gb ETHERNET DRIVER
 +M:    Coiby Xu <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/networking/device_drivers/qlogic/qlge.rst
 +
  QM1D1B0004 MEDIA DRIVER
  M:    Akihiro Tsukada <[email protected]>
  L:    [email protected]
@@@ -17193,7 -17213,6 +17194,7 @@@ F:   drivers/mfd/syscon.
  
  SYSTEM CONTROL & POWER/MANAGEMENT INTERFACE (SCPI/SCMI) Message Protocol drivers
  M:    Sudeep Holla <[email protected]>
 +R:    Cristian Marussi <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/arm,sc[mp]i.txt
@@@ -17201,7 -17220,6 +17202,7 @@@ F:   drivers/clk/clk-sc[mp]i.
  F:    drivers/cpufreq/sc[mp]i-cpufreq.c
  F:    drivers/firmware/arm_scmi/
  F:    drivers/firmware/arm_scpi.c
 +F:    drivers/regulator/scmi-regulator.c
  F:    drivers/reset/reset-scmi.c
  F:    include/linux/sc[mp]i_protocol.h
  F:    include/trace/events/scmi.h
@@@ -17827,7 -17845,7 +17828,7 @@@ M:   Dan Murphy <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/can/tcan4x5x.txt
 -F:    drivers/net/can/m_can/tcan4x5x.c
 +F:    drivers/net/can/m_can/tcan4x5x*
  
  TI TRF7970A NFC DRIVER
  M:    Mark Greer <[email protected]>
index b97c628ad91ff3c8b9f7c81f8bc0b6909bf35b74,b3e4e07400891a67a32d63d443966925f225d76d..52dbd58f6810a0d5fca88c74c6d18e8e25c59c90
  #define THERMAL_TABLE(name)
  #endif
  
+ #ifdef CONFIG_DTPM
+ #define DTPM_TABLE()                                                  \
+       . = ALIGN(8);                                                   \
+       __dtpm_table = .;                                               \
+       KEEP(*(__dtpm_table))                                           \
+       __dtpm_table_end = .;
+ #else
+ #define DTPM_TABLE()
+ #endif
  #define KERNEL_DTB()                                                  \
        STRUCT_ALIGN();                                                 \
        __dtb_start = .;                                                \
        }                                                               \
                                                                        \
        /* Built-in firmware blobs */                                   \
 -      .builtin_fw        : AT(ADDR(.builtin_fw) - LOAD_OFFSET) {      \
 +      .builtin_fw : AT(ADDR(.builtin_fw) - LOAD_OFFSET) ALIGN(8) {    \
                __start_builtin_fw = .;                                 \
                KEEP(*(.builtin_fw))                                    \
                __end_builtin_fw = .;                                   \
        ACPI_PROBE_TABLE(irqchip)                                       \
        ACPI_PROBE_TABLE(timer)                                         \
        THERMAL_TABLE(governor)                                         \
+       DTPM_TABLE()                                                    \
        EARLYCON_TABLE()                                                \
        LSM_TABLE()                                                     \
        EARLY_LSM_TABLE()                                               \
This page took 0.192485 seconds and 4 git commands to generate.