Changes in setlocalversion

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/scripts/setlocalversion

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/scripts/setlocalversion

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/scripts/setlocalversion

670af65d2ab4a6a9bb72f014b080757e291ad3fe - Merge branch 'for-6.14/constify-bin-attribute' into for-linus

Mon, 20 Jan 2025 09:58:12 +0100

Merge branch 'for-6.14/constify-bin-attribute' into for-linus- constification of 'struct bin_attribute' in various HID driver (Thomas Weißschuh) List of files: /linux/scripts/setlocalversion

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/scripts/setlocalversion

302cc446cbd92aadff72a647cebc13d5634f8342 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Thu, 05 Dec 2024 20:48:58 +0100

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netCross-merge networking fixes after downstream PR (net-6.13-rc2).No conflicts or adjacent changes.Signed-off-by: Jakub Kicinski List of files: /linux/scripts/setlocalversion

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/scripts/setlocalversion

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/scripts/setlocalversion

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/scripts/setlocalversion

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/scripts/setlocalversion

bcfd5f644c5b933cfb3c488220e40a03e011e8a4 - Merge tag 'v6.13-rc1' into perf/core, to refresh the branch

Mon, 02 Dec 2024 11:52:59 +0100

Merge tag 'v6.13-rc1' into perf/core, to refresh the branchSigned-off-by: Ingo Molnar List of files: /linux/scripts/setlocalversion

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

Thu, 05 Dec 2024 18:09:29 +0100

Merge tag 'asoc-fix-v6.13-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linusASoC: Fixes for v6.13A few small fixes for v6.13, all system specific - the biggest thing isthe fix for jack handling over suspend on some Intel laptops. List of files: /linux/scripts/setlocalversion

6a34dfa15d6edf7e78b8118d862d2db0889cf669 - Merge tag 'kbuild-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Sat, 30 Nov 2024 22:41:50 +0100

Merge tag 'kbuild-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuildPull Kbuild updates from Masahiro Yamada: - Add generic support for built-in boot DTB files - Enable TAB cycling for dialog buttons in nconfig - Fix issues in streamline_config.pl - Refactor Kconfig - Add support for Clang's AutoFDO (Automatic Feedback-Directed Optimization) - Add support for Clang's Propeller, a profile-guided optimization. - Change the working directory to the external module directory for M= builds - Support building external modules in a separate output directory - Enable objtool for *.mod.o and additional kernel objects - Use lz4 instead of deprecated lz4c - Work around a performance issue with "git describe" - Refactor modpost* tag 'kbuild-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (85 commits) kbuild: rename .tmp_vmlinux.kallsyms0.syms to .tmp_vmlinux0.syms gitignore: Don't ignore 'tags' directory kbuild: add dependency from vmlinux to resolve_btfids modpost: replace tdb_hash() with hash_str() kbuild: deb-pkg: add python3:native to build dependency genksyms: reduce indentation in export_symbol() modpost: improve error messages in device_id_check() modpost: rename alias symbol for MODULE_DEVICE_TABLE() modpost: rename variables in handle_moddevtable() modpost: move strstarts() to modpost.h modpost: convert do_usb_table() to a generic handler modpost: convert do_of_table() to a generic handler modpost: convert do_pnp_device_entry() to a generic handler modpost: convert do_pnp_card_entries() to a generic handler modpost: call module_alias_printf() from all do_*_entry() functions modpost: pass (struct module *) to do_*_entry() functions modpost: remove DEF_FIELD_ADDR_VAR() macro modpost: deduplicate MODULE_ALIAS() for all drivers modpost: introduce module_alias_printf() helper modpost: remove unnecessary check in do_acpi_entry() ... List of files: /linux/scripts/setlocalversion

e2ff1219a5541a22921016219c4d86a6d0190d15 - setlocalversion: add -e option

Tue, 19 Nov 2024 00:09:06 +0100

setlocalversion: add -e optionSet the -e option to ensure this script fails on any unexpected errors.Without this change, the kernel build may continue running with anincorrect string in include/config/kernel.release.Currently, try_tag() returns 1 when the expected tag is not found as anancestor, but this is a case where the script should continue.Signed-off-by: Masahiro Yamada List of files: /linux/scripts/setlocalversion

523f3dbc187a9618d4fd80c2b438e4d490705dcd - setlocalversion: work around "git describe" performance

Mon, 18 Nov 2024 12:01:54 +0100

setlocalversion: work around "git describe" performanceContrary to expectations, passing a single candidate tag to "gitdescribe" is slower than not passing any --match options. $ time git describe --debug ... traversed 10619 commits ... v6.12-rc5-63-g0fc810ae3ae1 real 0m0.169s $ time git describe --match=v6.12-rc5 --debug ... traversed 1310024 commits v6.12-rc5-63-g0fc810ae3ae1 real 0m1.281sIn fact, the --debug output shows that git traverses all or most ofhistory. For some repositories and/or git versions, those 1.3s areactually 10-15 seconds.This has been acknowledged as a performance bug in git [1], and a fixis on its way [2]. However, no solution is yet in git.git, and evenwhen one lands, it will take quite a while before it finds its way toa release and for $random_kernel_developer to pick that up.So rewrite the logic to use plumbing commands. For each of thecandidate values of $tag, we ask: (1) is $tag even an annotatedtag? (2) Is it eligible to describe HEAD, i.e. an ancestor ofHEAD? (3) If so, how many commits are in $tag..HEAD?I have tested that this produces the same output as the current scriptfor ~700 random commits between v6.9..v6.10. For those 700 commits,and in my git repo, the 'make -s kernelrelease' command is on average~4 times faster with this patch applied (geometric mean of ratios).For the commit mentioned in Josh's original report [3], thetime-consuming part of setlocalversion goes from$ time git describe --match=v6.12-rc5 c1e939a21eb1v6.12-rc5-44-gc1e939a21eb1real 0m1.210sto$ time git rev-list --count --left-right v6.12-rc5..c1e939a21eb10 44real 0m0.037s[1] https://lore.kernel.org/git/20241101113910.GA2301440@coredump.intra.peff.net/[2] https://lore.kernel.org/git/20241106192236.GC880133@coredump.intra.peff.net/[3] https://lore.kernel.org/lkml/309549cafdcfe50c4fceac3263220cc3d8b109b2.1730337435.git.jpoimboe@kernel.org/Reported-by: Sean Christopherson Closes: https://lore.kernel.org/lkml/ZPtlxmdIJXOe0sEy@google.com/Reported-by: Josh Poimboeuf Closes: https://lore.kernel.org/lkml/309549cafdcfe50c4fceac3263220cc3d8b109b2.1730337435.git.jpoimboe@kernel.org/Tested-by: Josh Poimboeuf Signed-off-by: Rasmus Villemoes Signed-off-by: Masahiro Yamada List of files: /linux/scripts/setlocalversion

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/scripts/setlocalversion

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/scripts/setlocalversion

03c11eb3b16dc0058589751dfd91f254be2be613 - Merge tag 'v6.8-rc4' into x86/percpu, to resolve conflicts and refresh the branch

Wed, 14 Feb 2024 10:45:07 +0100

Merge tag 'v6.8-rc4' into x86/percpu, to resolve conflicts and refresh the branchConflicts: arch/x86/include/asm/percpu.h arch/x86/include/asm/text-patching.hSigned-off-by: Ingo Molnar List of files: /linux/scripts/setlocalversion

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

Tue, 24 Oct 2023 10:50:22 +0200

Merge drm/drm-next into drm-intel-gt-nextWork that needs to land in drm-intel-gt-next depends on two patches onlypresent in drm-intel-next, absence of which is causing a merge conflict: 3b918f4f0c8b ("drm/i915/pxp: Optimize GET_PARAM:PXP_STATUS") ac765b7018f6 ("drm/i915/pxp/mtl: intel_pxp_init_hw needs runtime-pm inside pm-complete")Signed-off-by: Tvrtko Ursulin List of files: /linux/scripts/setlocalversion

20cd569d7ee8fce24e8753f0f43af6c420557b1f - Merge branch 'for-6.7/config_pm' into for-linus

Wed, 01 Nov 2023 00:07:35 +0100

Merge branch 'for-6.7/config_pm' into for-linus- #ifdef CONFIG_PM removal from HID code (Thomas Weißschuh) List of files: /linux/scripts/setlocalversion