Changes in Makefile

f4b369c6fe0ceaba2da2daff8c9eb415f85926dd - Merge branch 'next' into for-linus

Mon, 20 Apr 2026 03:28:57 +0200

Merge branch 'next' into for-linusPrepare input updates for 7.1 merge window. List of files: /linux/drivers/pci/pcie/Makefile

0421ccdfad0d92713a812a5aeb7d07b0ea7213c8 - Merge tag 'v7.0-rc3' into next

Thu, 12 Mar 2026 18:44:42 +0100

Merge tag 'v7.0-rc3' into nextSync up with the mainline to brig up the latest changes, specificallychanges to ALPS driver. List of files: /linux/drivers/pci/pcie/Makefile

3e9e952bb3139ad1e08f3e1960239c2988ab90c9 - Merge branch 'for-7.1-printf-kunit-build' into for-linus

Mon, 20 Apr 2026 13:41:28 +0200

Merge branch 'for-7.1-printf-kunit-build' into for-linus List of files: /linux/drivers/pci/pcie/Makefile

42d3b66d4cdbacfc9d120d2301b8de89cc29a914 - Merge drm/drm-next into drm-xe-next

Thu, 12 Mar 2026 15:17:56 +0100

Merge drm/drm-next into drm-xe-nextBackmerging to bring in 7.00-rc3. Important ahead GPU SVM merging THPsupport.Signed-off-by: Matthew Brost List of files: /linux/drivers/pci/pcie/Makefile

f09812b85fa6f41058bcc46e70ac406bf9b0493a - Merge drm/drm-next into drm-intel-next

Wed, 25 Feb 2026 12:23:04 +0100

Merge drm/drm-next into drm-intel-nextSync with v7.0-rc1 which contains a few treewide changes affecting i915.Signed-off-by: Jani Nikula List of files: /linux/drivers/pci/pcie/Makefile

8b85987d3cf50178f67618122d9f3bb202f62f42 - Merge drm/drm-next into drm-misc-next

Mon, 23 Feb 2026 11:48:20 +0100

Merge drm/drm-next into drm-misc-nextLet's merge 7.0-rc1 to start the new drm-misc-next windowSigned-off-by: Maxime Ripard List of files: /linux/drivers/pci/pcie/Makefile

c17ee635fd3a482b2ad2bf5e269755c2eae5f25e - Merge drm/drm-fixes into drm-misc-fixes

Mon, 23 Feb 2026 10:09:45 +0100

Merge drm/drm-fixes into drm-misc-fixes7.0-rc1 was just released, let's merge it to kick the new release cycle.Signed-off-by: Maxime Ripard List of files: /linux/drivers/pci/pcie/Makefile

e812928be2ee1c2744adf20ed04e0ce1e2fc5c13 - Merge tag 'cxl-for-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl

Fri, 13 Feb 2026 01:33:05 +0100

Merge tag 'cxl-for-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxlPull CXL updates from Dave Jiang: - Introduce cxl_memdev_attach and pave way for soft reserved handling, type2 accelerator enabling, and LSA 2.0 enabling. All these series require the endpoint driver to settle before continuing the memdev driver probe. - Address CXL port error protocol handling and reporting. The large patch series was split into three parts. The first two parts are included here with the final part coming later. The first part consists of a series of code refactoring to PCI AER sub-system that addresses CXL and also CXL RAS code to prepare for port error handling. The second part refactors the CXL code to move management of component registers to cxl_port objects to allow all CXL AER errors to be handled through the cxl_port hierarchy. - Provide AMD Zen5 platform address translation for CXL using ACPI PRMT. This includes a conventions document to explain why this is needed and how it's implemented. - Misc CXL patches of fixes, cleanups, and updates. Including CXL address translation for unaligned MOD3 regions.[ TLA service: CXL is "Compute Express Link" ]* tag 'cxl-for-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl: (59 commits) cxl: Disable HPA/SPA translation handlers for Normalized Addressing cxl/region: Factor out code into cxl_region_setup_poison() cxl/atl: Lock decoders that need address translation cxl: Enable AMD Zen5 address translation using ACPI PRMT cxl/acpi: Prepare use of EFI runtime services cxl: Introduce callback for HPA address ranges translation cxl/region: Use region data to get the root decoder cxl/region: Add @hpa_range argument to function cxl_calc_interleave_pos() cxl/region: Separate region parameter setup and region construction cxl: Simplify cxl_root_ops allocation and handling cxl/region: Store HPA range in struct cxl_region cxl/region: Store root decoder in struct cxl_region cxl/region: Rename misleading variable name @hpa to @hpa_range Documentation/driver-api/cxl: ACPI PRM Address Translation Support and AMD Zen5 enablement cxl, doc: Moving conventions in separate files cxl, doc: Remove isonum.txt inclusion cxl/port: Unify endpoint and switch port lookup cxl/port: Move endpoint component register management to cxl_port cxl/port: Map Port RAS registers cxl/port: Move dport RAS setup to dport add time ... List of files: /linux/drivers/pci/pcie/Makefile

914c743509d56067eeeb2b5e341a44a68ef8377d - Merge branch 'for-7.0/cxl-aer-prep' into cxl-for-next

Fri, 23 Jan 2026 00:59:43 +0100

Merge branch 'for-7.0/cxl-aer-prep' into cxl-for-nextPreparation for CXL port error protocol handling. First part containsall the changes centered around setting up the PCI side of errorhandling.cxl: Update RAS handler interfaces to also support CXL Portscxl/mem: Clarify @host for devm_cxl_add_nvdimm()PCI/AER: Update struct aer_err_info with kernel-doc formattingPCI/AER: Report CXL or PCIe bus type in AER trace loggingPCI/AER: Use guard() in cxl_rch_handle_error_iter()PCI/AER: Move CXL RCH error handling to aer_cxl_rch.cPCI/AER: Update is_internal_error() to be non-static is_aer_internal_error()PCI/AER: Export pci_aer_unmask_internal_errors()cxl/pci: Move CXL driver's RCH error handling into core/ras_rch.cPCI/AER: Replace PCIEAER_CXL symbol with CXL_RAScxl/pci: Remove CXL VH handling in CONFIG_PCIEAER_CXL conditional blocks from core/pci.cPCI: Replace cxl_error_is_native() with pcie_aer_is_native()cxl/pci: Remove unnecessary CXL RCH handling helper functionscxl/pci: Remove unnecessary CXL Endpoint handling helper functionsPCI: Introduce pcie_is_cxl()PCI: Update CXL DVSEC definitionsPCI: Move CXL DVSEC definitions into uapi/linux/pci_regs.h List of files: /linux/drivers/pci/pcie/Makefile

59010029faf27c82d1e786dfd1fb83b09f478d1b - PCI/AER: Move CXL RCH error handling to aer_cxl_rch.c

Wed, 14 Jan 2026 19:20:32 +0100

PCI/AER: Move CXL RCH error handling to aer_cxl_rch.cThe Restricted CXL Host (RCH) AER error handling logic currently residesin the AER driver file, aer.c. CXL specific changes conditionally compiledusing #ifdefs.Improve the AER driver maintainability by separating the RCH specific logicfrom the AER driver's core functionality and removing the ifdefs. Introducedrivers/pci/pcie/aer_cxl_rch.c for moving the RCH AER logic into. Conditionallycompile the file using the CONFIG_CXL_RCH_RAS Kconfig.Move the CXL logic into the new file but leave CXL helper functionis_internal_error() in aer.c for now as it will be moved in future patchfor CXL Virtual Hierarchy handling.To maintain compilation after the move other changes are required. Changecxl_rch_handle_error(), cxl_rch_enable_rcec(), and is_internal_error() tobe non-static inorder for accessing from the AER driver.Update the new file with the SPDX and 2023 AMD copyright notations becausethe RCH bits were initially contributed in 2023 by AMD. See commit:commit 0a867568bb0d ("PCI/AER: Forward RCH downstream port-detected errors to the CXL.mem dev handler")Signed-off-by: Terry Bowman Reviewed-by: Dave Jiang Reviewed-by: Jonathan Cameron Reviewed-by: Ben Cheatham Reviewed-by: Dan Williams Link: https://patch.msgid.link/20260114182055.46029-12-terry.bowman@amd.comSigned-off-by: Dan Williams Signed-off-by: Dave Jiang List of files: /linux/drivers/pci/pcie/Makefile

1260ed77798502de9c98020040d2995008de10cc - Merge drm/drm-fixes into drm-misc-fixes

Tue, 08 Apr 2025 10:15:47 +0200

Merge drm/drm-fixes into drm-misc-fixesBackmerging to get updates from v6.15-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/drivers/pci/pcie/Makefile

946661e3bef8efa11ba8079d4ebafe6fc3b0aaad - Merge branch 'next' into for-linus

Sat, 05 Apr 2025 08:04:35 +0200

Merge branch 'next' into for-linusPrepare input updates for 6.15 merge window. List of files: /linux/drivers/pci/pcie/Makefile

0b119045b79a672bc6d8f18641c60fc8ce1b4585 - Merge tag 'v6.14-rc4' into next

Wed, 26 Feb 2025 01:03:25 +0100

Merge tag 'v6.14-rc4' into nextSync up with the mainline. List of files: /linux/drivers/pci/pcie/Makefile

9e676a024fa1fa2bd8150c2d2ba85478280353bc - Merge tag 'v6.14-rc1' into perf-tools-next

Wed, 05 Feb 2025 23:57:18 +0100

Merge tag 'v6.14-rc1' into perf-tools-nextTo get the various fixes in the current master.Signed-off-by: Namhyung Kim List of files: /linux/drivers/pci/pcie/Makefile

0410c6121529409b08e81a77ae3ee58c657e2243 - Merge drm/drm-next into drm-xe-next

Fri, 28 Feb 2025 15:54:14 +0100

Merge drm/drm-next into drm-xe-nextSync to fix conlicts between drm-xe-next and drm-intel-next.Signed-off-by: Lucas De Marchi List of files: /linux/drivers/pci/pcie/Makefile

93c7dd1b39444ebd5a6a98e56a363d7a4e646775 - Merge drm/drm-next into drm-misc-next

Thu, 06 Feb 2025 13:47:32 +0100

Merge drm/drm-next into drm-misc-nextBring rc1 to start the new release dev.Signed-off-by: Maxime Ripard List of files: /linux/drivers/pci/pcie/Makefile

ea9f8f2b21795a5d80418a655bcb212d5b89e08f - Merge drm/drm-next into drm-intel-next

Wed, 05 Feb 2025 18:12:37 +0100

Merge drm/drm-next into drm-intel-nextSync with v6.14-rc1.Signed-off-by: Jani Nikula List of files: /linux/drivers/pci/pcie/Makefile

c771600c6af14749609b49565ffb4cac2959710d - Merge drm/drm-next into drm-intel-gt-next

Wed, 05 Feb 2025 10:29:14 +0100

Merge drm/drm-next into drm-intel-gt-nextWe need4ba4f1afb6a9 ("perf: Generic hotplug support for a PMU with a scope")in order to land a i915 PMU simplification and a fix. That landed in 6.12and we are stuck at 6.9 so lets bump things forward.Signed-off-by: Tvrtko Ursulin List of files: /linux/drivers/pci/pcie/Makefile

b3cc7428a32202936904b5b07cf9f135025bafd6 - Merge branch 'for-6.15/amd_sfh' into for-linus

Wed, 26 Mar 2025 13:42:07 +0100

Merge branch 'for-6.15/amd_sfh' into for-linusFrom: Mario Limonciello Some platforms include a human presence detection (HPD) sensor. Whenenabled and a user is detected a wake event will be emitted from thesensor fusion hub that software can react to.Example use cases are "wake from suspend on approach" or to "lockwhen leaving".This is currently enabled by default on supported systems, but userscan't control it. This essentially means that wake on approach isenabled which is a really surprising behavior to users that don'texpect it.Instead of defaulting to enabled add a sysfs knob that users canuse to enable the feature if desirable and set it to disabled bydefault. List of files: /linux/drivers/pci/pcie/Makefile

60675d4ca1ef0857e44eba5849b74a3a998d0c0f - Merge branch 'linus' into x86/mm, to pick up fixes

Fri, 20 Dec 2024 10:25:44 +0100

Merge branch 'linus' into x86/mm, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/drivers/pci/pcie/Makefile