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/video/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/video/Makefile

3daee2e4b3568f0ed88b0598df96547fcf21cb9b - Merge tag 'v6.10' into next

Tue, 16 Jul 2024 00:50:05 +0200

Merge tag 'v6.10' into nextSync up with mainline to bring in device_for_each_child_node_scoped()and other newer APIs. List of files: /linux/arch/x86/video/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/arch/x86/video/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/arch/x86/video/Makefile

afeea2758b4f1210361ce2a91d8fa3e7df606ad2 - Merge drm-misc-next-2024-07-04 into drm-misc-next-fixes

Thu, 04 Jul 2024 15:19:33 +0200

Merge drm-misc-next-2024-07-04 into drm-misc-next-fixesLet's start the drm-misc-next-fixes cycle.Signed-off-by: Maxime Ripard List of files: /linux/arch/x86/video/Makefile

d754ed2821fd9675d203cb73c4afcd593e28b7d0 - Merge drm/drm-next into drm-intel-next

Wed, 19 Jun 2024 10:38:31 +0200

Merge drm/drm-next into drm-intel-nextSync to v6.10-rc3.Signed-off-by: Jani Nikula List of files: /linux/arch/x86/video/Makefile

89aa02edaa30e4327ebc8fca9b80795bbfd4ce9b - Merge drm/drm-next into drm-xe-next

Wed, 12 Jun 2024 17:31:42 +0200

Merge drm/drm-next into drm-xe-nextNeeded to get tracing cleanup and add mmio tracing series.Signed-off-by: Rodrigo Vivi List of files: /linux/arch/x86/video/Makefile

92815da4576a495cb6362cdfb132152fccc2222d - Merge remote-tracking branch 'drm-misc/drm-misc-next' into HEAD

Wed, 12 Jun 2024 15:51:59 +0200

Merge remote-tracking branch 'drm-misc/drm-misc-next' into HEADMerge drm-misc-next tree into the msm-next tree in order to be able touse HDMI connector framework for the MSM HDMI driver. List of files: /linux/arch/x86/video/Makefile

375c4d1583948cf2439833e4a85d5a0aee853895 - Merge drm/drm-next into drm-misc-next

Mon, 27 May 2024 11:08:31 +0200

Merge drm/drm-next into drm-misc-nextLet's start the new release cycle.Signed-off-by: Maxime Ripard List of files: /linux/arch/x86/video/Makefile

3c69140734a27f8b145f12fa0ae80c1fe36a02ca - Merge branch 'for-6.11/trivial' into for-linus

Tue, 16 Jul 2024 12:19:28 +0200

Merge branch 'for-6.11/trivial' into for-linusCouple of trivial fixes:- extra semicolon (Chen Ni)- typo (Thorsten Blum) List of files: /linux/arch/x86/video/Makefile

0c8ea05e9b3d8e5287e2a968f2a2e744dfd31b99 - Merge branch 'tip/x86/cpu'

Thu, 04 Jul 2024 16:00:24 +0200

Merge branch 'tip/x86/cpu'The Lunarlake patches rely on the new VFM stuff.Signed-off-by: Peter Zijlstra List of files: /linux/arch/x86/video/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/arch/x86/video/Makefile

f73a058be5d70dd81a43f16b2bbff4b1576a7af8 - Merge remote-tracking branch 'drm/drm-fixes' into drm-misc-fixes

Tue, 28 May 2024 22:21:34 +0200

Merge remote-tracking branch 'drm/drm-fixes' into drm-misc-fixesv6.10-rc1 is released, forward from v6.9Signed-off-by: Maarten Lankhorst List of files: /linux/arch/x86/video/Makefile

3eb3c33c1d87029a3832e205eebd59cfb56ba3a4 - Merge tag 'asm-generic-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

Tue, 21 May 2024 00:18:34 +0200

Merge tag 'asm-generic-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-genericPull asm-generic cleanups from Arnd Bergmann: "These are a few cross-architecture cleanup patches: - separate out fbdev support from the asm/video.h contents that may be used by either the old fbdev drivers or the newer drm display code (Thomas Zimmermann) - cleanups for the generic bitops code and asm-generic/bug.h (Thorsten Blum) - remove the orphaned include/asm-generic/page.h header that used to be included by long-removed mmu-less architectures (me)"* tag 'asm-generic-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: arch: Fix name collision with ACPI's video.o bug: Improve comment asm-generic: remove unused asm-generic/page.h arch: Rename fbdev header and source files arch: Remove struct fb_info from video helpers arch: Select fbdev helpers with CONFIG_VIDEO bitops: Change function return types from long to int List of files: /linux/arch/x86/video/Makefile

34cda5ab89d4f30bc8d8f8d28980a7b8c68db6ec - arch: Fix name collision with ACPI's video.o

Fri, 17 May 2024 11:14:33 +0200

arch: Fix name collision with ACPI's video.oCommit 2fd001cd3600 ("arch: Rename fbdev header and source files")renames the video source files under arch/ such that they do notrefer to fbdev any longer. The new files named video.o conflict withACPI's video.ko module. Modprobing the ACPI module can then fail withwarnings about missing symbols, as shown below. (i915_selftest:1107) igt_kmod-WARNING: i915: Unknown symbol acpi_video_unregister (err -2) (i915_selftest:1107) igt_kmod-WARNING: i915: Unknown symbol acpi_video_register_backlight (err -2) (i915_selftest:1107) igt_kmod-WARNING: i915: Unknown symbol __acpi_video_get_backlight_type (err -2) (i915_selftest:1107) igt_kmod-WARNING: i915: Unknown symbol acpi_video_register (err -2)Fix the issue by renaming the architecture's video.o to video-common.o.Reported-by: Chaitanya Kumar Borah Closes: https://lore.kernel.org/intel-gfx/9dcac6e9-a3bf-4ace-bbdc-f697f767f9e0@suse.de/T/#tSigned-off-by: Thomas Zimmermann Fixes: 2fd001cd3600 ("arch: Rename fbdev header and source files")Reviewed-by: Hans de Goede Cc: Arnd Bergmann Cc: linux-arch@vger.kernel.orgCc: linux-fbdev@vger.kernel.orgCc: dri-devel@lists.freedesktop.orgSigned-off-by: Arnd Bergmann List of files: /linux/arch/x86/video/Makefile

2fd001cd36005846caa6456fff1008c6f5bae9d4 - arch: Rename fbdev header and source files

Fri, 29 Mar 2024 21:32:12 +0100

arch: Rename fbdev header and source filesThe per-architecture fbdev code has no dependencies on fbdev and canbe used for any video-related subsystem. Rename the files to 'video'.Use video-sti.c on parisc as the source file depends on CONFIG_STI_CORE.On arc, arm, arm64, sh, and um the asm header file is an empty wrapperaround the file in asm-generic. Let Kbuild generate the file. The buildsystem does this automatically. Only um needs to generate video.hexplicitly, so that it overrides the host architecture's header. Thelatter would otherwise interfere with the build.Further update all includes statements, include guards, and Makefiles.Also update a few strings and comments to refer to video instead offbdev.v3:- arc, arm, arm64, sh: generate asm header via build system (Sam,Helge, Arnd)- um: rename fb.h to video.h- fix typo in commit message (Sam)Signed-off-by: Thomas Zimmermann Reviewed-by: Sam Ravnborg Cc: Vineet Gupta Cc: Catalin Marinas Cc: Will Deacon Cc: Huacai Chen Cc: WANG Xuerui Cc: Geert Uytterhoeven Cc: Thomas Bogendoerfer Cc: "James E.J. Bottomley" Cc: Helge Deller Cc: Michael Ellerman Cc: Nicholas Piggin Cc: Yoshinori Sato Cc: Rich Felker Cc: John Paul Adrian Glaubitz Cc: "David S. Miller" Cc: Andreas Larsson Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: x86@kernel.orgCc: "H. Peter Anvin" Signed-off-by: Arnd Bergmann List of files: /linux/arch/x86/video/Makefile

f25eae2c405cbe810f8c52d743ea2b507c3fc301 - arch: Select fbdev helpers with CONFIG_VIDEO

Fri, 29 Mar 2024 21:32:10 +0100

arch: Select fbdev helpers with CONFIG_VIDEOVarious Kconfig options selected the per-architecture helpers forfbdev. But none of the contained code depends on fbdev. Standardizeon CONFIG_VIDEO, which will allow to add more general helpers forvideo functionality.CONFIG_VIDEO protects each architecture's video/ directory. Thisallows for the use of more fine-grained control for each directory'sfiles, such as the use of CONFIG_STI_CORE on parisc.v2:- sparc: rebased onto Makefile changesSigned-off-by: Thomas Zimmermann Reviewed-by: Sam Ravnborg Cc: "James E.J. Bottomley" Cc: Helge Deller Cc: "David S. Miller" Cc: Andreas Larsson Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: x86@kernel.orgCc: "H. Peter Anvin" Signed-off-by: Arnd Bergmann List of files: /linux/arch/x86/video/Makefile

a940daa52167e9db8ecce82213813b735a9d9f23 - Merge branch 'linus' into smp/core

Tue, 17 Oct 2023 21:40:46 +0200

Merge branch 'linus' into smp/corePull in upstream to get the fixes so depending changes can be applied. List of files: /linux/arch/x86/video/Makefile

de80193308f43d3ae52cd3561e8ba77cd1437311 - Merge tag 'v6.6-rc4' into perf/core, to pick up fixes

Tue, 03 Oct 2023 09:32:25 +0200

Merge tag 'v6.6-rc4' into perf/core, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/arch/x86/video/Makefile