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/platform/efi/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/platform/efi/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/platform/efi/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/platform/efi/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/platform/efi/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/platform/efi/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/platform/efi/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/platform/efi/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/platform/efi/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/platform/efi/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/platform/efi/Makefile

e55037c879a087a57d775e848a58430ab3380fc1 - Merge tag 'efi-next-for-v6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi

Tue, 16 Jul 2024 21:22:07 +0200

Merge tag 'efi-next-for-v6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efiPull EFI updates from Ard Biesheuvel: "Note the removal of the EFI fake memory map support - this is believed to be unused and no longer worth supporting. However, we could easily bring it back if needed. With recent developments regarding confidential VMs and unaccepted memory, combined with kexec, creating a known inaccurate view of the firmware's memory map and handing it to the OS is a feature we can live without, hence the removal. Alternatively, I could imagine making this feature mutually exclusive with those confidential VM related features, but let's try simply removing it first. Summary: - Drop support for the 'fake' EFI memory map on x86 - Add an SMBIOS based tweak to the EFI stub instructing the firmware on x86 Macbook Pros to keep both GPUs enabled - Replace 0-sized array with flexible array in EFI memory attributes table handling - Drop redundant BSS clearing when booting via the native PE entrypoint on x86 - Avoid returning EFI_SUCCESS when aborting on an out-of-memory condition - Cosmetic tweak for arm64 KASLR loading logic"* tag 'efi-next-for-v6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi: efi: Replace efi_memory_attributes_table_t 0-sized array with flexible array efi: Rename efi_early_memdesc_ptr() to efi_memdesc_ptr() arm64/efistub: Clean up KASLR logic x86/efistub: Drop redundant clearing of BSS x86/efistub: Avoid returning EFI_SUCCESS on error x86/efistub: Call Apple set_os protocol on dual GPU Intel Macs x86/efistub: Enable SMBIOS protocol handling for x86 efistub/smbios: Simplify SMBIOS enumeration API x86/efi: Drop support for fake EFI memory maps List of files: /linux/arch/x86/platform/efi/Makefile

37aee82c213d352dccb850dc4228dda2e7e591b1 - x86/efi: Drop support for fake EFI memory maps

Thu, 20 Jun 2024 09:10:49 +0200

x86/efi: Drop support for fake EFI memory mapsBetween kexec and confidential VM support, handling the EFI memory mapscorrectly on x86 is already proving to be rather difficult (as opposedto other EFI architectures which manage to never modify the EFI memorymap to begin with)EFI fake memory map support is essentially a development hack (fortesting new support for the 'special purpose' and 'more reliable' EFImemory attributes) that leaked into production code. The regions markedin this manner are not actually recognized as such by the firmwareitself or the EFI stub (and never have), and marking memory as 'morereliable' seems rather futile if the underlying memory is just ordinaryRAM.Marking memory as 'special purpose' in this way is also dubious, but maybe in use in production code nonetheless. However, the same should beachievable by using the memmap= command line option with the ! operator.EFI fake memmap support is not enabled by any of the major distros(Debian, Fedora, SUSE, Ubuntu) and does not exist on otherarchitectures, so let's drop support for it.Acked-by: Borislav Petkov (AMD) Acked-by: Dan Williams Signed-off-by: Ard Biesheuvel List of files: /linux/arch/x86/platform/efi/Makefile

7ae9fb1b7ecbb5d85d07857943f677fd1a559b18 - Merge branch 'next' into for-linus

Tue, 21 Feb 2023 20:19:49 +0100

Merge branch 'next' into for-linusPrepare input updates for 6.3 merge window. List of files: /linux/arch/x86/platform/efi/Makefile

6f84981772535e670e4e2df051a672af229b6694 - Merge drm/drm-next into drm-misc-next

Thu, 19 Jan 2023 10:56:12 +0100

Merge drm/drm-next into drm-misc-nextBackmerging into drm-misc-next to get DRM accelerator infrastructure,which is required by ipuv driver.Signed-off-by: Thomas Zimmermann List of files: /linux/arch/x86/platform/efi/Makefile

407da561244b9d51e6a794d6305ba38ec2c9d907 - Merge tag 'v6.2-rc3' into next

Tue, 10 Jan 2023 05:28:19 +0100

Merge tag 'v6.2-rc3' into nextMerge with mainline to bring in timer_shutdown_sync() API. List of files: /linux/arch/x86/platform/efi/Makefile

0d8eae7b124e2ddaee00f186fe922450faad0ed7 - Merge drm/drm-next into drm-intel-next

Mon, 02 Jan 2023 10:31:03 +0100

Merge drm/drm-next into drm-intel-nextSync up with v6.2-rc1.Signed-off-by: Jani Nikula List of files: /linux/arch/x86/platform/efi/Makefile

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

Fri, 30 Dec 2022 10:09:09 +0100

Merge drm/drm-next into drm-intel-gt-nextSync after v6.2-rc1 landed in drm-next.We need to get some dependencies in place before we can mergethe fixes series from Gwan-gyeong and Chris.References: https://lore.kernel.org/all/Y6x5JCDnh2rvh4lA@intel.com/Signed-off-by: Rodrigo Vivi List of files: /linux/arch/x86/platform/efi/Makefile

6599e683db1bf22fee74302c47e31b9a42a1c3d2 - Merge tag 'v6.2-rc1' into media_tree

Wed, 28 Dec 2022 17:07:44 +0100

Merge tag 'v6.2-rc1' into media_treeLinux 6.2-rc1* tag 'v6.2-rc1': (14398 commits) Linux 6.2-rc1 treewide: Convert del_timer*() to timer_shutdown*() pstore: Properly assign mem_type property pstore: Make sure CONFIG_PSTORE_PMSG selects CONFIG_RT_MUTEXES cfi: Fix CFI failure with KASAN perf python: Fix splitting CC into compiler and options afs: Stop implementing ->writepage() afs: remove afs_cache_netfs and afs_zap_permits() declarations afs: remove variable nr_servers afs: Fix lost servers_outstanding count ALSA: usb-audio: Add new quirk FIXED_RATE for JBL Quantum810 Wireless ALSA: azt3328: Remove the unused function snd_azf3328_codec_outl() gcov: add support for checksum field test_maple_tree: add test for mas_spanning_rebalance() on insufficient data maple_tree: fix mas_spanning_rebalance() on insufficient data hugetlb: really allocate vma lock for all sharable vmas kmsan: export kmsan_handle_urb kmsan: include linux/vmalloc.h mm/mempolicy: fix memory leak in set_mempolicy_home_node system call mm, mremap: fix mremap() expanding vma with addr inside vma ... List of files: /linux/arch/x86/platform/efi/Makefile

d0e99511834b6828c960e978d9a8cb6e5731250d - Merge wireless into wireless-next

Tue, 17 Jan 2023 12:36:25 +0100

Merge wireless into wireless-nextDue to the two cherry picked commits from wireless to wireless-next we haveseveral conflicts in mt76. To avoid any bugs with conflicts merge wireless intowireless-next.96f134dc1964 wifi: mt76: handle possible mt76_rx_token_consume failuresfe13dad8992b wifi: mt76: dma: do not increment queue head if mt76_dma_add_buf fails List of files: /linux/arch/x86/platform/efi/Makefile