Merge tag 'pci-v6.7-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci

Pull PCI fixes from Bjorn Helgaas:

 - Revert an ASPM patch that caused an unintended reboot when resuming
   after suspend (Bjorn Helgaas)

 - Orphan Cadence PCIe IP (Bjorn Helgaas)

* tag 'pci-v6.7-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci:
  MAINTAINERS: Orphan Cadence PCIe IP
  Revert "PCI/ASPM: Remove pcie_aspm_pm_state_change()"

diff --combined CREDITS
index 81845c39e3cf3755394488ec44a507095d952a03,55be8af1c74f5617ea5d63b75c4c10f0870d1456..6b4b06bb683ba1131b0c5104616820054e74710e
--- 1/CREDITS
--- 2/CREDITS
+++ b/CREDITS
@@@ -1855,6 -1855,10 +1855,10 @@@ D: Fedora kernel maintenance (2003-2014
  D: 'Trinity' and similar fuzz testing work.
  D: Misc/Other.
  
+ N: Tom Joseph
+ E: [email protected]
+ D: Cadence PCIe driver
+ 
  N: Martin Josfsson
  E: [email protected]
  P: 1024D/F6B6D3B1 7610 7CED 5C34 4AA6 DBA2  8BE1 5A6D AF95 F6B6 D3B1
@@@ -2944,14 -2948,6 +2948,14 @@@ D: IPX development and suppor
  N: Venkatesh Pallipadi (Venki)
  D: x86/HPET
  
 +N: Antti Palosaari
 +E: [email protected]
 +D: Various DVB drivers
 +W: https://palosaari.fi/linux/
 +S: Yliopistokatu 1 D 513
 +S: FI-90570 Oulu
 +S: FINLAND
 +
  N: Kyungmin Park
  E: [email protected]
  D: Samsung S5Pv210 and Exynos4210 mobile platforms

diff --combined MAINTAINERS
index f5c2450fa4ec2963bbd19581f7a4cae7381da3fc,595aa56acde4449eb59f43440f410df135213916..45b7b2046c107f59b689b5053b07a14e33c000fd
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -171,10 -171,13 +171,10 @@@ S:      Supporte
  F:    drivers/soc/fujitsu/a64fx-diag.c
  
  A8293 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/dvb-frontends/a8293*
  
  AACRAID SCSI RAID DRIVER
@@@ -573,17 -576,23 +573,17 @@@ F:      drivers/iio/accel/adxl372_i2c.
  F:    drivers/iio/accel/adxl372_spi.c
  
  AF9013 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/dvb-frontends/af9013*
  
  AF9033 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/dvb-frontends/af9033*
  
  AFFS FILE SYSTEM
@@@ -641,10 -650,13 +641,10 @@@ F:      fs/aio.
  F:    include/linux/*aio*.h
  
  AIRSPY MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/usb/airspy/
  
  ALACRITECH GIGABIT ETHERNET DRIVER
@@@ -2143,7 -2155,6 +2143,7 @@@ S:      Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
  F:    arch/arm/boot/dts/nxp/imx/
  F:    arch/arm/boot/dts/nxp/mxs/
 +F:    arch/arm64/boot/dts/freescale/
  X:    arch/arm64/boot/dts/freescale/fsl-*
  X:    arch/arm64/boot/dts/freescale/qoriq-*
  X:    drivers/media/i2c/
@@@ -2524,7 -2535,7 +2524,7 @@@ F:      drivers/*/*/*wpcm
  F:    drivers/*/*wpcm*
  
  ARM/NXP S32G ARCHITECTURE
 -M:    Chester Lin <clin@suse.com>
 +M:    Chester Lin <chester62515@gmail.com>
  R:    Andreas Färber <[email protected]>
  R:    Matthias Brugger <[email protected]>
  R:    NXP S32 Linux Team <[email protected]>
@@@ -5065,6 -5076,7 +5065,6 @@@ CLANG CONTROL FLOW INTEGRITY SUPPOR
  M:    Sami Tolvanen <[email protected]>
  M:    Kees Cook <[email protected]>
  R:    Nathan Chancellor <[email protected]>
 -R:    Nick Desaulniers <[email protected]>
  L:    [email protected]
  S:    Supported
  B:    https://github.com/ClangBuiltLinux/linux/issues
@@@ -5079,9 -5091,8 +5079,9 @@@ F:      .clang-forma
  
  CLANG/LLVM BUILD SUPPORT
  M:    Nathan Chancellor <[email protected]>
 -M:    Nick Desaulniers <[email protected]>
 -R:    Tom Rix <[email protected]>
 +R:    Nick Desaulniers <[email protected]>
 +R:    Bill Wendling <[email protected]>
 +R:    Justin Stitt <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://clangbuiltlinux.github.io/
@@@ -5231,6 -5242,7 +5231,6 @@@ F:      drivers/platform/x86/compal-laptop.
  
  COMPILER ATTRIBUTES
  M:    Miguel Ojeda <[email protected]>
 -R:    Nick Desaulniers <[email protected]>
  S:    Maintained
  F:    include/linux/compiler_attributes.h
  
@@@ -5593,10 -5605,13 +5593,10 @@@ F:   Documentation/driver-api/media/drive
  F:    drivers/media/pci/cx88/
  
  CXD2820R MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/dvb-frontends/cxd2820r*
  
  CXGB3 ETHERNET DRIVER (CXGB3)
@@@ -5709,10 -5724,13 +5709,10 @@@ F:   Documentation/devicetree/bindings/in
  F:    drivers/input/keyboard/cypress-sf.c
  
  CYPRESS_FIRMWARE MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/common/cypress_firmware*
  
  CYTTSP TOUCHSCREEN DRIVER
@@@ -6050,8 -6068,10 +6050,8 @@@ M:     Mikulas Patocka <[email protected]
  M:    [email protected]
  L:    [email protected]
  S:    Maintained
 -W:    http://sources.redhat.com/dm
  Q:    http://patchwork.kernel.org/project/dm-devel/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git
 -T:    quilt http://people.redhat.com/agk/patches/linux/editing/
  F:    Documentation/admin-guide/device-mapper/
  F:    drivers/md/Kconfig
  F:    drivers/md/Makefile
@@@ -7300,38 -7320,53 +7300,38 @@@ T:   git git://linuxtv.org/media_tree.gi
  F:    drivers/media/pci/dt3155/
  
  DVB_USB_AF9015 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/usb/dvb-usb-v2/af9015*
  
  DVB_USB_AF9035 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/usb/dvb-usb-v2/af9035*
  
  DVB_USB_ANYSEE MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/usb/dvb-usb-v2/anysee*
  
  DVB_USB_AU6610 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/usb/dvb-usb-v2/au6610*
  
  DVB_USB_CE6230 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/usb/dvb-usb-v2/ce6230*
  
  DVB_USB_CXUSB MEDIA DRIVER
@@@ -7345,17 -7380,22 +7345,17 @@@ T:   git git://linuxtv.org/media_tree.gi
  F:    drivers/media/usb/dvb-usb/cxusb*
  
  DVB_USB_EC168 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/usb/dvb-usb-v2/ec168*
  
  DVB_USB_GL861 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/usb/dvb-usb-v2/gl861*
  
  DVB_USB_MXL111SF MEDIA DRIVER
@@@ -7369,18 -7409,23 +7369,18 @@@ T:   git git://linuxtv.org/mkrufky/mxl111
  F:    drivers/media/usb/dvb-usb-v2/mxl111sf*
  
  DVB_USB_RTL28XXU MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/usb/dvb-usb-v2/rtl28xxu*
  
  DVB_USB_V2 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
  W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/usb/dvb-usb-v2/dvb_usb*
  F:    drivers/media/usb/dvb-usb-v2/usb_urb.c
  
@@@ -7422,10 -7467,13 +7422,10 @@@ F:   Documentation/devicetree/bindings/in
  F:    drivers/input/misc/e3x0-button.c
  
  E4000 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/tuners/e4000*
  
  EARTH_PT1 MEDIA DRIVER
@@@ -7441,10 -7489,13 +7441,10 @@@ S:   Odd Fixe
  F:    drivers/media/pci/pt3/
  
  EC100 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/dvb-frontends/ec100*
  
  ECRYPT FILE SYSTEM
@@@ -7804,7 -7855,6 +7804,7 @@@ R:      Yue Hu <[email protected]
  R:    Jeffle Xu <[email protected]>
  L:    [email protected]
  S:    Maintained
 +W:    https://erofs.docs.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
  F:    Documentation/ABI/testing/sysfs-fs-erofs
  F:    Documentation/filesystems/erofs.rst
@@@ -8062,10 -8112,13 +8062,10 @@@ F:   drivers/media/tuners/fc0011.
  F:    drivers/media/tuners/fc0011.h
  
  FC2580 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/tuners/fc2580*
  
  FCOE SUBSYSTEM (libfc, libfcoe, fcoe)
@@@ -8897,6 -8950,7 +8897,6 @@@ S:      Maintaine
  F:    scripts/get_maintainer.pl
  
  GFS2 FILE SYSTEM
 -M:    Bob Peterson <[email protected]>
  M:    Andreas Gruenbacher <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -9000,9 -9054,12 +9000,9 @@@ K:     (devm_)?gpio_regmap_(un)?registe
  GPIO SUBSYSTEM
  M:    Linus Walleij <[email protected]>
  M:    Bartosz Golaszewski <[email protected]>
 -R:    Andy Shevchenko <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
 -F:    Documentation/ABI/obsolete/sysfs-gpio
 -F:    Documentation/ABI/testing/gpio-cdev
  F:    Documentation/admin-guide/gpio/
  F:    Documentation/devicetree/bindings/gpio/
  F:    Documentation/driver-api/gpio/
@@@ -9011,16 -9068,6 +9011,16 @@@ F:    include/dt-bindings/gpio
  F:    include/linux/gpio.h
  F:    include/linux/gpio/
  F:    include/linux/of_gpio.h
 +
 +GPIO UAPI
 +M:    Bartosz Golaszewski <[email protected]>
 +R:    Kent Gibson <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
 +F:    Documentation/ABI/obsolete/sysfs-gpio
 +F:    Documentation/ABI/testing/gpio-cdev
 +F:    drivers/gpio/gpiolib-cdev.c
  F:    include/uapi/linux/gpio.h
  F:    tools/gpio/
  
@@@ -9202,10 -9249,13 +9202,10 @@@ F:   include/trace/events/habanalabs.
  F:    include/uapi/drm/habanalabs_accel.h
  
  HACKRF MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/usb/hackrf/
  
  HANDSHAKE UPCALL FOR TRANSPORT LAYER SECURITY
@@@ -9531,7 -9581,6 +9531,7 @@@ F:      drivers/bus/hisi_lpc.
  HISILICON NETWORK SUBSYSTEM 3 DRIVER (HNS3)
  M:    Yisen Zhuang <[email protected]>
  M:    Salil Mehta <[email protected]>
 +M:    Jijie Shao <[email protected]>
  L:    [email protected]
  S:    Maintained
  W:    http://www.hisilicon.com
@@@ -9579,7 -9628,6 +9579,7 @@@ F:      drivers/crypto/hisilicon/sgl.
  F:    include/linux/hisi_acc_qm.h
  
  HISILICON ROCE DRIVER
 +M:    Chengchang Tang <[email protected]>
  M:    Junxian Huang <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -10646,7 -10694,6 +10646,7 @@@ F:   drivers/gpio/gpio-pch.
  F:    drivers/gpio/gpio-sch.c
  F:    drivers/gpio/gpio-sodaville.c
  F:    drivers/gpio/gpio-tangier.c
 +F:    drivers/gpio/gpio-tangier.h
  
  INTEL GVT-g DRIVERS (Intel GPU Virtualization)
  M:    Zhenyu Wang <[email protected]>
@@@ -10978,6 -11025,7 +10978,6 @@@ F:   drivers/net/wireless/intel/iwlwifi
  
  INTEL WMI SLIM BOOTLOADER (SBL) FIRMWARE UPDATE DRIVER
  M:    Jithu Joseph <[email protected]>
 -R:    Maurice Ma <[email protected]>
  S:    Maintained
  W:    https://slimbootloader.github.io/security/firmware-update.html
  F:    drivers/platform/x86/intel/wmi/sbl-fw-update.c
@@@ -11281,10 -11329,13 +11281,10 @@@ F:        Documentation/hwmon/it87.rs
  F:    drivers/hwmon/it87.c
  
  IT913X MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/tuners/it913x*
  
  ITE IT66121 HDMI BRIDGE DRIVER
@@@ -11466,6 -11517,7 +11466,6 @@@ F:   fs/autofs
  KERNEL BUILD + files below scripts/ (unless maintained elsewhere)
  M:    Masahiro Yamada <[email protected]>
  R:    Nathan Chancellor <[email protected]>
 -R:    Nick Desaulniers <[email protected]>
  R:    Nicolas Schier <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -11477,7 -11529,6 +11477,7 @@@ F:   scripts/*vmlinux
  F:    scripts/Kbuild*
  F:    scripts/Makefile*
  F:    scripts/basic/
 +F:    scripts/clang-tools/
  F:    scripts/dummy-tools/
  F:    scripts/mk*
  F:    scripts/mod/
@@@ -12158,13 -12209,6 +12158,13 @@@ F: include/linux/nd.
  F:    include/uapi/linux/ndctl.h
  F:    tools/testing/nvdimm/
  
 +LIBRARY CODE
 +M:    Andrew Morton <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-nonmm-unstable
 +F:    lib/*
 +
  LICENSES and SPDX stuff
  M:    Thomas Gleixner <[email protected]>
  M:    Greg Kroah-Hartman <[email protected]>
@@@ -12197,8 -12241,6 +12197,8 @@@ LINUX FOR POWERPC (32-BIT AND 64-BIT
  M:    Michael Ellerman <[email protected]>
  R:    Nicholas Piggin <[email protected]>
  R:    Christophe Leroy <[email protected]>
 +R:    Aneesh Kumar K.V <[email protected]>
 +R:    Naveen N. Rao <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://github.com/linuxppc/wiki/wiki
@@@ -12646,10 -12688,13 +12646,10 @@@ W:        http://www.tazenda.demon.co.uk/phil/
  F:    arch/m68k/hp300/
  
  M88DS3103 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/dvb-frontends/m88ds3103*
  
  M88RS2000 MEDIA DRIVER
@@@ -13734,6 -13779,7 +13734,6 @@@ F:   drivers/net/ethernet/mellanox/mlxfw
  MELLANOX HARDWARE PLATFORM SUPPORT
  M:    Hans de Goede <[email protected]>
  M:    Ilpo Järvinen <[email protected]>
 -M:    Mark Gross <[email protected]>
  M:    Vadim Pasternak <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -14342,6 -14388,7 +14342,6 @@@ F:   drivers/platform/surface/surface_gpe
  MICROSOFT SURFACE HARDWARE PLATFORM SUPPORT
  M:    Hans de Goede <[email protected]>
  M:    Ilpo Järvinen <[email protected]>
 -M:    Mark Gross <[email protected]>
  M:    Maximilian Luz <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -14543,16 -14590,20 +14543,16 @@@ F:        include/asm-generic/tlb.
  F:    mm/mmu_gather.c
  
  MN88472 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  F:    drivers/media/dvb-frontends/mn88472*
  
  MN88473 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  F:    drivers/media/dvb-frontends/mn88473*
  
@@@ -14640,17 -14691,23 +14640,17 @@@ S:        Orpha
  F:    drivers/platform/x86/msi-wmi.c
  
  MSI001 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/tuners/msi001*
  
  MSI2500 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/usb/msi2500/
  
  MSTAR INTERRUPT CONTROLLER DRIVER
@@@ -14938,7 -14995,6 +14938,7 @@@ M:   Jakub Kicinski <[email protected]
  M:    Paolo Abeni <[email protected]>
  L:    [email protected]
  S:    Maintained
 +P:    Documentation/process/maintainer-netdev.rst
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
@@@ -14990,7 -15046,6 +14990,7 @@@ M:   Jakub Kicinski <[email protected]
  M:    Paolo Abeni <[email protected]>
  L:    [email protected]
  S:    Maintained
 +P:    Documentation/process/maintainer-netdev.rst
  Q:    https://patchwork.kernel.org/project/netdevbpf/list/
  B:    mailto:[email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
@@@ -15001,7 -15056,6 +15001,7 @@@ F:   Documentation/networking
  F:    Documentation/process/maintainer-netdev.rst
  F:    Documentation/userspace-api/netlink/
  F:    include/linux/in.h
 +F:    include/linux/indirect_call_wrapper.h
  F:    include/linux/net.h
  F:    include/linux/netdevice.h
  F:    include/net/
@@@ -15014,7 -15068,6 +15014,7 @@@ F:   lib/random32.
  F:    net/
  F:    tools/net/
  F:    tools/testing/selftests/net/
 +X:    net/9p/
  X:    net/bluetooth/
  
  NETWORKING [IPSEC]
@@@ -16458,11 -16511,10 +16458,10 @@@ F:        Documentation/devicetree/bindings/pc
  F:    drivers/pci/controller/dwc/pcie-armada8k.c
  
  PCI DRIVER FOR CADENCE PCIE IP
- M:    Tom Joseph <[email protected]>
  L:    [email protected]
- S:    Maintained
+ S:    Orphan
  F:    Documentation/devicetree/bindings/pci/cdns,*
- F:    drivers/pci/controller/cadence/
+ F:    drivers/pci/controller/cadence/*cadence*
  
  PCI DRIVER FOR FREESCALE LAYERSCAPE
  M:    Minghuan Lian <[email protected]>
@@@ -17722,10 -17774,13 +17721,10 @@@ F:        drivers/bus/fsl-mc
  F:    include/uapi/linux/fsl_mc.h
  
  QT1010 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/tuners/qt1010*
  
  QUALCOMM ATH12K WIRELESS DRIVER
@@@ -17892,8 -17947,6 +17891,8 @@@ L:   [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/iommu/arm/arm-smmu/qcom_iommu.c
 +F:    drivers/iommu/arm/arm-smmu/arm-smmu-qcom*
 +F:    drivers/iommu/msm_iommu*
  
  QUALCOMM IPC ROUTER (QRTR) DRIVER
  M:    Manivannan Sadhasivam <[email protected]>
@@@ -18780,24 -18833,33 +18779,24 @@@ S:        Maintaine
  F:    drivers/tty/rpmsg_tty.c
  
  RTL2830 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/dvb-frontends/rtl2830*
  
  RTL2832 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/dvb-frontends/rtl2832*
  
  RTL2832_SDR MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/dvb-frontends/rtl2832_sdr*
  
  RTL8180 WIRELESS DRIVER
@@@ -19574,6 -19636,7 +19573,6 @@@ S:   Maintaine
  F:    drivers/misc/sgi-xp/
  
  SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
 -M:    Karsten Graul <[email protected]>
  M:    Wenjia Zhang <[email protected]>
  M:    Jan Karcher <[email protected]>
  R:    D. Wythe <[email protected]>
@@@ -19606,10 -19669,13 +19605,10 @@@ F:        drivers/media/platform/renesas/sh_vo
  F:    include/media/drv-intf/sh_vou.h
  
  SI2157 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/tuners/si2157*
  
  SI2165 MEDIA DRIVER
@@@ -19621,10 -19687,13 +19620,10 @@@ Q:        http://patchwork.linuxtv.org/project
  F:    drivers/media/dvb-frontends/si2165*
  
  SI2168 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/dvb-frontends/si2168*
  
  SI470X FM RADIO RECEIVER I2C DRIVER
@@@ -21126,24 -21195,33 +21125,24 @@@ W:        http://tcp-lp-mod.sourceforge.net
  F:    net/ipv4/tcp_lp.c
  
  TDA10071 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/dvb-frontends/tda10071*
  
  TDA18212 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/tuners/tda18212*
  
  TDA18218 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/tuners/tda18218*
  
  TDA18250 MEDIA DRIVER
@@@ -21690,9 -21768,7 +21689,9 @@@ F:   Documentation/devicetree/bindings/co
  F:    drivers/counter/ti-eqep.c
  
  TI ETHERNET SWITCH DRIVER (CPSW)
 -R:    Grygorii Strashko <[email protected]>
 +R:    Siddharth Vadapalli <[email protected]>
 +R:    Ravi Gunasekaran <[email protected]>
 +R:    Roger Quadros <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -21716,15 -21792,6 +21715,15 @@@ F: Documentation/devicetree/bindings/me
  F:    drivers/media/i2c/ds90*
  F:    include/media/i2c/ds90*
  
 +TI ICSSG ETHERNET DRIVER (ICSSG)
 +R:    MD Danish Anwar <[email protected]>
 +R:    Roger Quadros <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/ti,icss*.yaml
 +F:    drivers/net/ethernet/ti/icssg/*
 +
  TI J721E CSI2RX DRIVER
  M:    Jai Luthra <[email protected]>
  L:    [email protected]
@@@ -22000,7 -22067,6 +21999,7 @@@ F:   drivers/watchdog/tqmx86_wdt.
  TRACING
  M:    Steven Rostedt <[email protected]>
  M:    Masami Hiramatsu <[email protected]>
 +R:    Mathieu Desnoyers <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -22079,10 -22145,13 +22078,10 @@@ F:        include/uapi/linux/serial_core.
  F:    include/uapi/linux/tty.h
  
  TUA9001 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org
 -W:    http://palosaari.fi/linux/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/tuners/tua9001*
  
  TULIP NETWORK DRIVERS
@@@ -23584,6 -23653,7 +23583,6 @@@ F:   drivers/platform/x86/x86-android-tab
  X86 PLATFORM DRIVERS
  M:    Hans de Goede <[email protected]>
  M:    Ilpo Järvinen <[email protected]>
 -M:    Mark Gross <[email protected]>
  L:    [email protected]
  S:    Maintained
  Q:    https://patchwork.kernel.org/project/platform-driver-x86/list/
@@@ -23621,20 -23691,6 +23620,20 @@@ F: arch/x86/kernel/dumpstack.
  F:    arch/x86/kernel/stacktrace.c
  F:    arch/x86/kernel/unwind_*.c
  
 +X86 TRUST DOMAIN EXTENSIONS (TDX)
 +M:    Kirill A. Shutemov <[email protected]>
 +R:    Dave Hansen <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/tdx
 +F:    arch/x86/boot/compressed/tdx*
 +F:    arch/x86/coco/tdx/
 +F:    arch/x86/include/asm/shared/tdx.h
 +F:    arch/x86/include/asm/tdx.h
 +F:    arch/x86/virt/vmx/tdx/
 +F:    drivers/virt/coco/tdx-guest
 +
  X86 VDSO
  M:    Andy Lutomirski <[email protected]>
  L:    [email protected]
@@@ -23815,7 -23871,8 +23814,7 @@@ T:   git git://git.kernel.org/pub/scm/fs/
  P:    Documentation/filesystems/xfs-maintainer-entry-profile.rst
  F:    Documentation/ABI/testing/sysfs-fs-xfs
  F:    Documentation/admin-guide/xfs.rst
 -F:    Documentation/filesystems/xfs-delayed-logging-design.rst
 -F:    Documentation/filesystems/xfs-self-describing-metadata.rst
 +F:    Documentation/filesystems/xfs-*
  F:    fs/xfs/
  F:    include/uapi/linux/dqblk_xfs.h
  F:    include/uapi/linux/fsmap.h
@@@ -24027,16 -24084,20 +24026,16 @@@ S:        Orpha
  F:    drivers/net/wireless/zydas/zd1211rw/
  
  ZD1301 MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org/
 -W:    http://palosaari.fi/linux/
  Q:    https://patchwork.linuxtv.org/project/linux-media/list/
  F:    drivers/media/usb/dvb-usb-v2/zd1301*
  
  ZD1301_DEMOD MEDIA DRIVER
 -M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  W:    https://linuxtv.org/
 -W:    http://palosaari.fi/linux/
  Q:    https://patchwork.linuxtv.org/project/linux-media/list/
  F:    drivers/media/dvb-frontends/zd1301_demod*
  

diff --combined drivers/pci/pcie/aspm.c
index 5dab531c8654d68eaaf1e0db404e543f0c64497e,8715e951c491943e9c39d94a6f3c3ecf4e8610e1..060f4b3c8698fdd51de623d2ec326a14d8d99d38
--- 1/drivers/pci/pcie/aspm.c
--- 2/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@@ -1008,6 -1008,25 +1008,25 @@@ void pcie_aspm_exit_link_state(struct p
        up_read(&pci_bus_sem);
  }
  
+ /* @pdev: the root port or switch downstream port */
+ void pcie_aspm_pm_state_change(struct pci_dev *pdev)
+ {
+       struct pcie_link_state *link = pdev->link_state;
+ 
+       if (aspm_disabled || !link)
+               return;
+       /*
+        * Devices changed PM state, we should recheck if latency
+        * meets all functions' requirement
+        */
+       down_read(&pci_bus_sem);
+       mutex_lock(&aspm_lock);
+       pcie_update_aspm_capable(link->root);
+       pcie_config_aspm_path(link);
+       mutex_unlock(&aspm_lock);
+       up_read(&pci_bus_sem);
+ }
+ 
  void pcie_aspm_powersave_config_link(struct pci_dev *pdev)
  {
        struct pcie_link_state *link = pdev->link_state;
@@@ -1041,7 -1060,7 +1060,7 @@@ static struct pcie_link_state *pcie_asp
        return bridge->link_state;
  }
  
 -static int __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem)
 +static int __pci_disable_link_state(struct pci_dev *pdev, int state, bool locked)
  {
        struct pcie_link_state *link = pcie_aspm_get_link(pdev);
  
@@@ -1060,7 -1079,7 +1079,7 @@@
                return -EPERM;
        }
  
 -      if (sem)
 +      if (!locked)
                down_read(&pci_bus_sem);
        mutex_lock(&aspm_lock);
        if (state & PCIE_LINK_STATE_L0S)
@@@ -1082,7 -1101,7 +1101,7 @@@
                link->clkpm_disable = 1;
        pcie_set_clkpm(link, policy_to_clkpm_state(link));
        mutex_unlock(&aspm_lock);
 -      if (sem)
 +      if (!locked)
                up_read(&pci_bus_sem);
  
        return 0;
@@@ -1090,9 -1109,7 +1109,9 @@@
  
  int pci_disable_link_state_locked(struct pci_dev *pdev, int state)
  {
 -      return __pci_disable_link_state(pdev, state, false);
 +      lockdep_assert_held_read(&pci_bus_sem);
 +
 +      return __pci_disable_link_state(pdev, state, true);
  }
  EXPORT_SYMBOL(pci_disable_link_state_locked);
  
@@@ -1107,11 -1124,21 +1126,11 @@@
   */
  int pci_disable_link_state(struct pci_dev *pdev, int state)
  {
 -      return __pci_disable_link_state(pdev, state, true);
 +      return __pci_disable_link_state(pdev, state, false);
  }
  EXPORT_SYMBOL(pci_disable_link_state);
  
 -/**
 - * pci_enable_link_state - Clear and set the default device link state so that
 - * the link may be allowed to enter the specified states. Note that if the
 - * BIOS didn't grant ASPM control to the OS, this does nothing because we can't
 - * touch the LNKCTL register. Also note that this does not enable states
 - * disabled by pci_disable_link_state(). Return 0 or a negative errno.
 - *
 - * @pdev: PCI device
 - * @state: Mask of ASPM link states to enable
 - */
 -int pci_enable_link_state(struct pci_dev *pdev, int state)
 +static int __pci_enable_link_state(struct pci_dev *pdev, int state, bool locked)
  {
        struct pcie_link_state *link = pcie_aspm_get_link(pdev);
  
@@@ -1128,8 -1155,7 +1147,8 @@@
                return -EPERM;
        }
  
 -      down_read(&pci_bus_sem);
 +      if (!locked)
 +              down_read(&pci_bus_sem);
        mutex_lock(&aspm_lock);
        link->aspm_default = 0;
        if (state & PCIE_LINK_STATE_L0S)
@@@ -1150,48 -1176,12 +1169,48 @@@
        link->clkpm_default = (state & PCIE_LINK_STATE_CLKPM) ? 1 : 0;
        pcie_set_clkpm(link, policy_to_clkpm_state(link));
        mutex_unlock(&aspm_lock);
 -      up_read(&pci_bus_sem);
 +      if (!locked)
 +              up_read(&pci_bus_sem);
  
        return 0;
  }
 +
 +/**
 + * pci_enable_link_state - Clear and set the default device link state so that
 + * the link may be allowed to enter the specified states. Note that if the
 + * BIOS didn't grant ASPM control to the OS, this does nothing because we can't
 + * touch the LNKCTL register. Also note that this does not enable states
 + * disabled by pci_disable_link_state(). Return 0 or a negative errno.
 + *
 + * @pdev: PCI device
 + * @state: Mask of ASPM link states to enable
 + */
 +int pci_enable_link_state(struct pci_dev *pdev, int state)
 +{
 +      return __pci_enable_link_state(pdev, state, false);
 +}
  EXPORT_SYMBOL(pci_enable_link_state);
  
 +/**
 + * pci_enable_link_state_locked - Clear and set the default device link state
 + * so that the link may be allowed to enter the specified states. Note that if
 + * the BIOS didn't grant ASPM control to the OS, this does nothing because we
 + * can't touch the LNKCTL register. Also note that this does not enable states
 + * disabled by pci_disable_link_state(). Return 0 or a negative errno.
 + *
 + * @pdev: PCI device
 + * @state: Mask of ASPM link states to enable
 + *
 + * Context: Caller holds pci_bus_sem read lock.
 + */
 +int pci_enable_link_state_locked(struct pci_dev *pdev, int state)
 +{
 +      lockdep_assert_held_read(&pci_bus_sem);
 +
 +      return __pci_enable_link_state(pdev, state, true);
 +}
 +EXPORT_SYMBOL(pci_enable_link_state_locked);
 +
  static int pcie_aspm_set_policy(const char *val,
                                const struct kernel_param *kp)
  {