Changes in Kconfig

cb9f145f638d7afa633632a9290d6ad06caeb8ee - Merge remote-tracking branch 'drm/drm-next' into msm-next-robclark

Sat, 01 Nov 2025 13:47:30 +0100

Merge remote-tracking branch 'drm/drm-next' into msm-next-robclarkBack-merge drm-next to get caught up.Signed-off-by: Rob Clark List of files: /linux/arch/csky/Kconfig

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

Tue, 16 Sep 2025 12:53:20 +0200

Merge drm/drm-next into drm-intel-gt-nextBackmerge in order to get the commit: 048832a3f400 ("drm/i915: Refactor shmem_pwrite() to use kiocb and write_iter")To drm-intel-gt-next as there are followup fixes to be applied.Signed-off-by: Joonas Lahtinen List of files: /linux/arch/csky/Kconfig

a53d0cf7f1cb3182ad533ff5cacfa5fd29c419ad - Merge commit 'linus' into core/bugs, to resolve conflicts

Tue, 05 Aug 2025 11:15:34 +0200

Merge commit 'linus' into core/bugs, to resolve conflictsResolve conflicts with this commit that was developed in parallelduring the merge window: 8c8efa93db68 ("x86/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust") Conflicts: arch/riscv/include/asm/bug.h arch/x86/include/asm/bug.hSigned-off-by: Ingo Molnar List of files: /linux/arch/csky/Kconfig

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

Wed, 08 Oct 2025 06:53:13 +0200

Merge branch 'next' into for-linusPrepare input updates for 6.18 merge window. List of files: /linux/arch/csky/Kconfig

4b051897df2375414587a245ecb9bb1a4d26b3b8 - Merge tag 'v6.17-rc2' into HEAD

Thu, 21 Aug 2025 20:46:49 +0200

Merge tag 'v6.17-rc2' into HEADSync up with mainline to bring in changes to include/linux/sprintf.h List of files: /linux/arch/csky/Kconfig

b4d90dbc4c1bc4bd3eb2d2989330af0eb95c98e8 - Merge drm/drm-next into drm-misc-next-fixes

Mon, 15 Sep 2025 10:23:28 +0200

Merge drm/drm-next into drm-misc-next-fixesBackmerging to drm-misc-next-fixes to get features and fixes fromv6.17-rc6.Signed-off-by: Thomas Zimmermann List of files: /linux/arch/csky/Kconfig

702fdf3513b045f596f836d9a4b8672c76f11834 - Merge drm/drm-next into drm-intel-next

Wed, 10 Sep 2025 14:01:42 +0200

Merge drm/drm-next into drm-intel-nextCatching up with some display dependencies.Signed-off-by: Rodrigo Vivi List of files: /linux/arch/csky/Kconfig

ca994e8922f25f7fed2075098f185cf198109eaa - Merge drm/drm-next into drm-xe-next

Tue, 12 Aug 2025 14:58:37 +0200

Merge drm/drm-next into drm-xe-nextBring v6.17-rc1 to propagate commits from other subsystems, particularlyPCI, which has some new functions needed for SR-IOV integration.Signed-off-by: Lucas De Marchi List of files: /linux/arch/csky/Kconfig

08c51f5bddc81c8c97c1eb11861b0dc009e5ccd8 - Merge drm/drm-next into drm-misc-n

Mon, 11 Aug 2025 14:37:45 +0200

Merge drm/drm-next into drm-misc-nUpdating drm-misc-next to the state of v6.17-rc1. Begins a new releasecycle.Signed-off-by: Thomas Zimmermann List of files: /linux/arch/csky/Kconfig

8d2b0853add1d7534dc0794e3c8e0b9e8c4ec640 - Merge drm/drm-fixes into drm-misc-fixes

Mon, 11 Aug 2025 16:49:06 +0200

Merge drm/drm-fixes into drm-misc-fixesUpdating drm-misc-fixes to the state of v6.17-rc1. Begins a new releasecycle.Signed-off-by: Thomas Zimmermann List of files: /linux/arch/csky/Kconfig

90a871f74b70027779a4f312c0c74b6a89e22412 - Merge tag 'ftrace-v6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace

Thu, 31 Jul 2025 01:04:10 +0200

Merge tag 'ftrace-v6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-tracePull ftrace updates from Steven Rostedt: - Keep track of when fgraph_ops are registered or not Keep accounting of when fgraph_ops are registered as if a fgraph_ops is registered twice it can mess up the accounting and it will not work as expected later. Trigger a warning if something registers it twice as to catch bugs before they are found by things just not working as expected. - Make DYNAMIC_FTRACE always enabled for architectures that support it As static ftrace (where all functions are always traced) is very expensive and only exists to help architectures support ftrace, do not make it an option. As soon as an architecture supports DYNAMIC_FTRACE make it use it. This simplifies the code. - Remove redundant config HAVE_FTRACE_MCOUNT_RECORD The CONFIG_HAVE_FTRACE_MCOUNT was added to help simplify the DYNAMIC_FTRACE work, but now every architecture that implements DYNAMIC_FTRACE also has HAVE_FTRACE_MCOUNT set too, making it redundant with the HAVE_DYNAMIC_FTRACE. - Make pid_ptr string size match the comment In print_graph_proc() the pid_ptr string is of size 11, but the comment says /* sign + log10(MAX_INT) + '\0' */ which is actually 12.* tag 'ftrace-v6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace: tracing: Remove redundant config HAVE_FTRACE_MCOUNT_RECORD ftrace: Make DYNAMIC_FTRACE always enabled for architectures that support it fgraph: Keep track of when fgraph_ops are registered or not fgraph: Make pid_str size match the comment List of files: /linux/arch/csky/Kconfig

4d6d0a6263babf7c43faa55de4fa3c6637dec624 - tracing: Remove redundant config HAVE_FTRACE_MCOUNT_RECORD

Fri, 04 Jul 2025 16:48:38 +0200

tracing: Remove redundant config HAVE_FTRACE_MCOUNT_RECORDFtrace is tightly coupled with architecture specific code because itrequires the use of trampolines written in assembly. This means that whena new feature or optimization is made, it must be done for allarchitectures. To simplify the approach, CONFIG_HAVE_FTRACE_* configs areadded to denote which architecture has the new enhancement so that otherarchitectures can still function until they too have been updated.The CONFIG_HAVE_FTRACE_MCOUNT was added to help simplify theDYNAMIC_FTRACE work, but now every architecture that implementsDYNAMIC_FTRACE also has HAVE_FTRACE_MCOUNT set too, making it redundantwith the HAVE_DYNAMIC_FTRACE.Remove the HAVE_FTRACE_MCOUNT config and use DYNAMIC_FTRACE directly whereapplicable.Link: https://lore.kernel.org/all/20250703154916.48e3ada7@gandalf.local.home/Cc: Masami Hiramatsu Cc: Mathieu Desnoyers Cc: Mark Rutland Cc: Linus Torvalds Link: https://lore.kernel.org/20250704104838.27a18690@gandalf.local.homeSigned-off-by: Steven Rostedt (Google) List of files: /linux/arch/csky/Kconfig

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/csky/Kconfig

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/arch/csky/Kconfig

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/arch/csky/Kconfig

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/arch/csky/Kconfig

c5fb51b71788926feef0d07f30c8af1d5e4af1a6 - Merge remote-tracking branch 'pm/opp/linux-next' into HEAD

Fri, 03 Jan 2025 16:13:45 +0100

Merge remote-tracking branch 'pm/opp/linux-next' into HEADMerge pm/opp tree to get dev_pm_opp_get_bw()Signed-off-by: Rob Clark List of files: /linux/arch/csky/Kconfig

e7f0a3a6f7339af55f1ca2c27131739d75569c08 - Merge drm/drm-next into drm-intel-next

Wed, 11 Dec 2024 21:06:05 +0100

Merge drm/drm-next into drm-intel-nextCatching up with 6.13-rc2.Signed-off-by: Rodrigo Vivi List of files: /linux/arch/csky/Kconfig

8f109f287fdc7b8fc7dcb6b2190c8b17dc22fcda - Merge drm/drm-next into drm-xe-next

Mon, 02 Dec 2024 17:22:11 +0100

Merge drm/drm-next into drm-xe-nextA backmerge to get the PMT preparation work formerging the BMG PMT support.Signed-off-by: Rodrigo Vivi List of files: /linux/arch/csky/Kconfig

3aba2eba84e0219fb66061359052be81bd883d53 - Merge drm/drm-next into drm-misc-next

Mon, 02 Dec 2024 12:44:18 +0100

Merge drm/drm-next into drm-misc-nextKickstart 6.14 cycle.Signed-off-by: Maxime Ripard List of files: /linux/arch/csky/Kconfig