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/arch/x86/kernel/acpi/Makefile

36ec807b627b4c0a0a382f0ae48eac7187d14b2b - Merge branch 'next' into for-linus

Fri, 20 Sep 2024 10:24:24 +0200

Merge branch 'next' into for-linusPrepare input updates for 6.12 merge window. List of files: /linux/arch/x86/kernel/acpi/Makefile

f057b57270c2a17d3f45c177e9434fa5745caa48 - Merge branch 'ib/6.11-rc6-matrix-keypad-spitz' into next

Fri, 06 Sep 2024 06:49:07 +0200

Merge branch 'ib/6.11-rc6-matrix-keypad-spitz' into nextBring in changes removing support for platform data from matrix-keypaddriver. List of files: /linux/arch/x86/kernel/acpi/Makefile

66e72a01b60ae6950ddbb3585fdc1424d303e14b - Merge tag 'v6.11-rc1' into clk-meson-next

Mon, 29 Jul 2024 16:32:02 +0200

Merge tag 'v6.11-rc1' into clk-meson-nextLinux 6.11-rc1 List of files: /linux/arch/x86/kernel/acpi/Makefile

ee057c8c194b9283f4137b253b70e292693a39f0 - Merge tag 'v6.11-rc3' into trace/ring-buffer/core

Wed, 14 Aug 2024 22:56:42 +0200

Merge tag 'v6.11-rc3' into trace/ring-buffer/coreThe "reserve_mem" kernel command line parameter has been pulled intov6.11. Merge the latest -rc3 to allow the persistent ring buffer memory tobe able to be mapped at the address specified by the "reserve_mem" commandline parameter.Signed-off-by: Steven Rostedt (Google) List of files: /linux/arch/x86/kernel/acpi/Makefile

c8faf11cd192214e231626c3ee973a35d8fc33f2 - Merge tag 'v6.11-rc1' into for-6.12

Tue, 30 Jul 2024 21:30:11 +0200

Merge tag 'v6.11-rc1' into for-6.12Linux 6.11-rc1 List of files: /linux/arch/x86/kernel/acpi/Makefile

ed7171ff9fabc49ae6ed42fbd082a576473836fc - Merge drm/drm-next into drm-xe-next

Fri, 16 Aug 2024 19:05:54 +0200

Merge drm/drm-next into drm-xe-nextGet drm-xe-next on v6.11-rc2 and synchronized with drm-intel-next forthe display side. This resolves the current conflict for theenable_display module parameter and allows further pending refactors.Signed-off-by: Lucas De Marchi List of files: /linux/arch/x86/kernel/acpi/Makefile

5c61f59824b5e46516ea5d0543ad7a8871567416 - Merge drm/drm-next into drm-misc-next

Mon, 12 Aug 2024 14:14:18 +0200

Merge drm/drm-next into drm-misc-nextGet drm-misc-next to the state of v6.11-rc2.Signed-off-by: Thomas Zimmermann List of files: /linux/arch/x86/kernel/acpi/Makefile

3663e2c4bc45fcdc71931fcbfcbfbf9b71f55c83 - Merge drm/drm-next into drm-intel-next

Thu, 01 Aug 2024 12:06:09 +0200

Merge drm/drm-next into drm-intel-nextSync with v6.11-rc1 in general, and specifically get the newBACKLIGHT_POWER_ constants for power states.Signed-off-by: Jani Nikula List of files: /linux/arch/x86/kernel/acpi/Makefile

4436e6da008fee87d54c038e983e5be9a6baf8fb - Merge branch 'linus' into x86/mm

Fri, 02 Aug 2024 14:10:55 +0200

Merge branch 'linus' into x86/mmBring x86 and selftests up to date List of files: /linux/arch/x86/kernel/acpi/Makefile

a1ff5a7d78a036d6c2178ee5acd6ba4946243800 - Merge drm/drm-fixes into drm-misc-fixes

Tue, 30 Jul 2024 09:09:23 +0200

Merge drm/drm-fixes into drm-misc-fixesLet's start the new drm-misc-fixes cycle by bringing in 6.11-rc1.Signed-off-by: Maxime Ripard List of files: /linux/arch/x86/kernel/acpi/Makefile

98896d8795d72acf166f83b06c2706effa019d92 - Merge tag 'x86_cc_for_v6.11_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Tue, 16 Jul 2024 04:36:01 +0200

Merge tag 'x86_cc_for_v6.11_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tipPull x86 confidential computing updates from Borislav Petkov: "Unrelated x86/cc changes queued here to avoid ugly cross-merges and conflicts: - Carve out CPU hotplug function declarations into a separate header with the goal to be able to use the lockdep assertions in a more flexible manner - As a result, refactor cacheinfo code after carving out a function to return the cache ID associated with a given cache level - Cleanups Add support to be able to kexec TDX guests: - Expand ACPI MADT CPU offlining support - Add machinery to prepare CoCo guests memory before kexec-ing into a new kernel - Cleanup, readjust and massage related code"* tag 'x86_cc_for_v6.11_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits) ACPI: tables: Print MULTIPROC_WAKEUP when MADT is parsed x86/acpi: Add support for CPU offlining for ACPI MADT wakeup method x86/mm: Introduce kernel_ident_mapping_free() x86/smp: Add smp_ops.stop_this_cpu() callback x86/acpi: Do not attempt to bring up secondary CPUs in the kexec case x86/acpi: Rename fields in the acpi_madt_multiproc_wakeup structure x86/mm: Do not zap page table entries mapping unaccepted memory table during kdump x86/mm: Make e820__end_ram_pfn() cover E820_TYPE_ACPI ranges x86/tdx: Convert shared memory back to private on kexec x86/mm: Add callbacks to prepare encrypted memory for kexec x86/tdx: Account shared memory x86/mm: Return correct level from lookup_address() if pte is none x86/mm: Make x86_platform.guest.enc_status_change_*() return an error x86/kexec: Keep CR4.MCE set during kexec for TDX guest x86/relocate_kernel: Use named labels for less confusion cpu/hotplug, x86/acpi: Disable CPU offlining for ACPI MADT wakeup cpu/hotplug: Add support for declaring CPU offlining not supported x86/apic: Mark acpi_mp_wake_* variables as __ro_after_init x86/acpi: Extract ACPI MADT wakeup code into a separate file x86/kexec: Remove spurious unconditional JMP from from identity_mapped() ... List of files: /linux/arch/x86/kernel/acpi/Makefile

1ceebe2e46720de02af4cf626dc847ecc4a263fd - x86/acpi: Add support for CPU offlining for ACPI MADT wakeup method

Fri, 14 Jun 2024 11:59:03 +0200

x86/acpi: Add support for CPU offlining for ACPI MADT wakeup methodMADT Multiprocessor Wakeup structure version 1 brings support for CPU offlining:BIOS provides a reset vector where the CPU has to jump to for offlining itself.The new TEST mailbox command can be used to test whether the CPU offlined itselfwhich means the BIOS has control over the CPU and can online it again via theACPI MADT wakeup method.Add CPU offlining support for the ACPI MADT wakeup method by implementing customcpu_die(), play_dead() and stop_this_cpu() SMP operations.CPU offlining makes it possible to hand over secondary CPUs over kexec, notlimiting the second kernel to a single CPU.The change conforms to the approved ACPI spec change proposal. See the Link.Signed-off-by: Kirill A. Shutemov Signed-off-by: Borislav Petkov (AMD) Reviewed-by: Kuppuswamy Sathyanarayanan Reviewed-by: Thomas Gleixner Acked-by: Kai Huang Acked-by: Rafael J. Wysocki Tested-by: Tao Liu Link: https://lore.kernel.org/all/13356251.uLZWGnKmhe@kreacherLink: https://lore.kernel.org/r/20240614095904.1345461-19-kirill.shutemov@linux.intel.com List of files: /linux/arch/x86/kernel/acpi/Makefile

2b5e22afae07ca7d833e251f6d60da8455676ee9 - x86/acpi: Extract ACPI MADT wakeup code into a separate file

Fri, 14 Jun 2024 11:58:46 +0200

x86/acpi: Extract ACPI MADT wakeup code into a separate fileIn order to prepare for the expansion of support for the ACPI MADTwakeup method, move the relevant code into a separate file.Introduce a new configuration option to clearly indicate dependencieswithout the use of ifdefs.There have been no functional changes.Signed-off-by: Kirill A. Shutemov Signed-off-by: Borislav Petkov (AMD) Reviewed-by: Baoquan He Reviewed-by: Kuppuswamy Sathyanarayanan Reviewed-by: Thomas Gleixner Acked-by: Borislav Petkov (AMD) Acked-by: Kai Huang Acked-by: Rafael J. Wysocki Tested-by: Tao Liu Link: https://lore.kernel.org/r/20240614095904.1345461-2-kirill.shutemov@linux.intel.com List of files: /linux/arch/x86/kernel/acpi/Makefile

4f2c0a4acffbec01079c28f839422e64ddeff004 - Merge branch 'main' into zstd-linus

Wed, 14 Dec 2022 01:21:55 +0100

Merge branch 'main' into zstd-linus List of files: /linux/arch/x86/kernel/acpi/Makefile

14e77332e74603efab8347c89d3cda447c3b97c9 - Merge branch 'main' into zstd-next

Sat, 22 Oct 2022 01:00:35 +0200

Merge branch 'main' into zstd-next List of files: /linux/arch/x86/kernel/acpi/Makefile

8bb5e7f4dcd9b9ef22a3ea25c9066a8a968f12dd - Merge branch 'next' into for-linus

Tue, 02 Aug 2022 19:06:12 +0200

Merge branch 'next' into for-linusPrepare input updates for 5.20 (or 6.0) merge window. List of files: /linux/arch/x86/kernel/acpi/Makefile

03ab8e6297acd1bc0eedaa050e2a1635c576fd11 - Merge tag 'v5.18'

Tue, 31 May 2022 15:13:23 +0200

Merge tag 'v5.18'Linux 5.18 List of files: /linux/arch/x86/kernel/acpi/Makefile

690e179059e7e89040d1cd564e39761567a8d5dc - Merge tag 'v5.18' into next

Sat, 28 May 2022 01:40:01 +0200

Merge tag 'v5.18' into nextSync up with mainline to get updates to OMAP4 keypad driver and otherupstream goodies. List of files: /linux/arch/x86/kernel/acpi/Makefile

0aea30a07ec6b50de0fc5f5b2ec34a68ead86b61 - Merge tag 'asoc-fix-v5.18-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

Tue, 19 Apr 2022 17:26:01 +0200

Merge tag 'asoc-fix-v5.18-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linusASoC: Fixes for v5.18A collection of fixes that came in since the merge window, plus one newdevice ID for an x86 laptop. Nothing that really stands out withparticularly big impact outside of the affected device. List of files: /linux/arch/x86/kernel/acpi/Makefile