Changes in 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/ras/amd/atl/Makefile

25768de50b1f2dbb6ea44bd5148a87fe2c9c3688 - Merge branch 'next' into for-linus

Tue, 21 Jan 2025 06:37:39 +0100

Merge branch 'next' into for-linusPrepare input updates for 6.14 merge window. List of files: /linux/drivers/ras/amd/atl/Makefile

6d4a0f4ea72319c9a37c1a7191695467006dd272 - Merge tag 'v6.13-rc3' into next

Tue, 17 Dec 2024 18:40:45 +0100

Merge tag 'v6.13-rc3' into nextSync up with the mainline. List of files: /linux/drivers/ras/amd/atl/Makefile

77b679453d3364688ff3e5153c0be5b2b52672b7 - Merge tag 'v6.12-rc3' into perf-tools-next

Mon, 14 Oct 2024 19:45:28 +0200

Merge tag 'v6.12-rc3' into perf-tools-nextTo get the fixes in the current perf-tools tree.Signed-off-by: Namhyung Kim List of files: /linux/drivers/ras/amd/atl/Makefile

3fd6c59042dbba50391e30862beac979491145fe - Merge tag 'v6.12-rc1' into clk-meson-next

Mon, 30 Sep 2024 11:28:07 +0200

Merge tag 'v6.12-rc1' into clk-meson-nextLinux 6.12-rc1 List of files: /linux/drivers/ras/amd/atl/Makefile

a0efa2f362a69e47b9d8b48f770ef3a0249a7911 - Merge net-next/main to resolve conflicts

Wed, 09 Oct 2024 08:59:14 +0200

Merge net-next/main to resolve conflictsThe wireless-next tree was based on something older, and thereare now conflicts between -rc2 and work here. Merge net-next,which has enough of -rc2 for the conflicts to happen, resolvingthem in the process.Signed-off-by: Johannes Berg List of files: /linux/drivers/ras/amd/atl/Makefile

b88132ceb3faccdd785809df75f9d490ebaab459 - Merge drm/drm-next into drm-xe-next

Fri, 04 Oct 2024 11:29:21 +0200

Merge drm/drm-next into drm-xe-nextBackmerging to resolve a conflict with core locally.Signed-off-by: Thomas Hellström List of files: /linux/drivers/ras/amd/atl/Makefile

2dd0ef5d951e9b565ddb324fe26c531b6a40bf82 - Merge drm/drm-next into drm-misc-next

Mon, 30 Sep 2024 10:50:54 +0200

Merge drm/drm-next into drm-misc-nextGet drm-misc-next to up v6.12-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/drivers/ras/amd/atl/Makefile

e0568571258d096f0277c74185bcbfc9cf21bccb - Merge drm/drm-next into drm-intel-next

Mon, 30 Sep 2024 10:49:10 +0200

Merge drm/drm-next into drm-intel-nextSync to v6.12-rc1.Signed-off-by: Jani Nikula List of files: /linux/drivers/ras/amd/atl/Makefile

c8d430db8eec7d4fd13a6bea27b7086a54eda6da - Merge tag 'kvmarm-fixes-6.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

Sun, 06 Oct 2024 09:59:22 +0200

Merge tag 'kvmarm-fixes-6.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEADKVM/arm64 fixes for 6.12, take #1- Fix pKVM error path on init, making sure we do not change critical system registers as we're about to fail- Make sure that the host's vector length is at capped by a value common to all CPUs- Fix kvm_has_feat*() handling of "negative" features, as the current code is pretty broken- Promote Joey to the status of official reviewer, while James steps down -- hopefully only temporarly List of files: /linux/drivers/ras/amd/atl/Makefile

0c436dfe5c25d0931b164b944165259f95e5281f - Merge tag 'asoc-fix-v6.12-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

Wed, 02 Oct 2024 21:29:16 +0200

Merge tag 'asoc-fix-v6.12-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linusASoC: Fixes for v6.12A bunch of fixes here that came in during the merge window and the firstweek of release, plus some new quirks and device IDs. There's nothingmajor here, it's a bit bigger than it might've been due to there beingno fixes sent during the merge window due to your vacation. List of files: /linux/drivers/ras/amd/atl/Makefile

2cd86f02c017bf9733e5cd891381b7d40f6f37ad - Merge remote-tracking branch 'drm/drm-fixes' into drm-misc-fixes

Tue, 01 Oct 2024 18:09:41 +0200

Merge remote-tracking branch 'drm/drm-fixes' into drm-misc-fixesRequired for a panthor fix that broke whenFOP_UNSIGNED_OFFSET was added in place of FMODE_UNSIGNED_OFFSET.Signed-off-by: Maarten Lankhorst List of files: /linux/drivers/ras/amd/atl/Makefile

3a39d672e7f48b8d6b91a09afa4b55352773b4b5 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Fri, 27 Sep 2024 08:13:52 +0200

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netCross-merge networking fixes after downstream PR.No conflicts and no adjacent changes.Signed-off-by: Paolo Abeni List of files: /linux/drivers/ras/amd/atl/Makefile

7dfc15c47372e8bf8a693ca3dfaaec33a68ee116 - Merge tag 'edac_updates_for_v6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras

Mon, 16 Sep 2024 06:36:37 +0200

Merge tag 'edac_updates_for_v6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/rasPull EDAC updates from Borislav Petkov: - Drop a now obsolete ppc4xx_edac driver - Fix conversion to physical memory addresses on Intel's Elkhart Lake and Ice Lake hardware when the system address is above the (Top-Of-Memory) TOM address - Pay attention to the memory hole on Zynq UltraScale+ MPSoC DDR controllers when injecting errors for testing purposes - Add support for translating normalized error addresses reported by an AMD memory controller into system physical addresses using an UEFI mechanism called platform runtime mechanism (PRM). - The usual cleanups and fixes* tag 'edac_updates_for_v6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras: EDAC: Drop obsolete PPC4xx driver EDAC/sb_edac: Fix the compile warning of large frame size EDAC/{skx_common,i10nm}: Remove the AMAP register for determing DDR5 EDAC/{skx_common,skx,i10nm}: Move the common debug code to skx_common EDAC/igen6: Fix conversion of system address to physical memory address EDAC/synopsys: Fix error injection on Zynq UltraScale+ RAS/AMD/ATL: Translate normalized to system physical addresses using PRM ACPI: PRM: Add PRM handler direct call support List of files: /linux/drivers/ras/amd/atl/Makefile

26e43c9a894176e7b7f7eaff61aaf2748d4aa520 - RAS/AMD/ATL: Translate normalized to system physical addresses using PRM

Tue, 30 Jul 2024 17:17:31 +0200

RAS/AMD/ATL: Translate normalized to system physical addresses using PRMAMD Zen-based systems report memory error addresses through machinecheck banks representing Unified Memory Controllers (UMCs) in the formof UMC relative "normalized" addresses. A normalized address must beconverted to a system physical address to be usable by the OS.Future AMD platforms will provide a UEFI PRM module that implements anumber of address translation PRM handlers. This will provide aninterface for the OS to call platform specific code without requiringthe use of SMM or other heavy firmware operations.Add support for the normalized to system physical address translationPRM handler in the AMD Address Translation Library and prefer it overnative code if available. The GUID and parameter buffer structure arespecific to the normalized to system physical address handler providedby the address translation PRM module included in future AMD systems.The address translation PRM module is documented in chapter 22 of thepublicly available "AMD Family 1Ah Models 00h–0Fh and Models 10h–1FhACPI v6.5 Porting Guide". [ bp: Massage commit message. ]Signed-off-by: John Allen Signed-off-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/20240730151731.15363-3-john.allen@amd.com List of files: /linux/drivers/ras/amd/atl/Makefile

a23e1966932464e1c5226cb9ac4ce1d5fc10ba22 - Merge branch 'next' into for-linus

Mon, 15 Jul 2024 23:03:44 +0200

Merge branch 'next' into for-linusPrepare input updates for 6.11 merge window. List of files: /linux/drivers/ras/amd/atl/Makefile

6f47c7ae8c7afaf9ad291d39f0d3974f191a7946 - Merge tag 'v6.9' into next

Tue, 28 May 2024 06:37:18 +0200

Merge tag 'v6.9' into nextSync up with the mainline to bring in the new cleanup API. List of files: /linux/drivers/ras/amd/atl/Makefile

60a2f25de7b8b785baee2932db932ae9a5b8c86d - Merge drm/drm-next into drm-intel-gt-next

Thu, 16 May 2024 09:33:01 +0200

Merge drm/drm-next into drm-intel-gt-nextSome display refactoring patches are needed in order to allow conflict-less merging.Signed-off-by: Tvrtko Ursulin List of files: /linux/drivers/ras/amd/atl/Makefile

594ce0b8a998aa4d05827cd7c0d0dcec9a1e3ae2 - Merge topic branches 'clkdev' and 'fixes' into for-linus

Mon, 10 Jun 2024 13:03:21 +0200

Merge topic branches 'clkdev' and 'fixes' into for-linus List of files: /linux/drivers/ras/amd/atl/Makefile

b228ab57e51b62663a80ca820c87ba2650583f08 - Merge branch 'master' into mm-stable

Mon, 18 Mar 2024 17:55:12 +0100

Merge branch 'master' into mm-stable List of files: /linux/drivers/ras/amd/atl/Makefile