Changes in git-resolve.sh

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

Tue, 16 Sep 2025 10:53:20 +0000

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/scripts/git-resolve.sh

ab93e0dd72c37d378dd936f031ffb83ff2bd87ce - Merge branch 'next' into for-linus

Wed, 06 Aug 2025 17:08:54 +0000

Merge branch 'next' into for-linusPrepare input updates for 6.17 merge window. List of files: /linux/scripts/git-resolve.sh

a7bee4e7f78089c101be2ad51f4b5ec64782053e - Merge tag 'ib-mfd-gpio-input-pwm-v6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into next

Mon, 04 Aug 2025 06:28:48 +0000

Merge tag 'ib-mfd-gpio-input-pwm-v6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into nextMerge an immutable branch between MFD, GPIO, Input and PWM to resolveconflicts for the merge window pull request. List of files: /linux/scripts/git-resolve.sh

e9ef810dfee7a2227da9d423aecb0ced35faddbe - Merge branch 'for-6.17/amd-sfh' into for-linus

Thu, 31 Jul 2025 20:36:25 +0000

Merge branch 'for-6.17/amd-sfh' into for-linus- add support for operating modes (Basavaraj Natikar) List of files: /linux/scripts/git-resolve.sh

74f1af95820fc2ee580a775a3a17c416db30b38c - Merge remote-tracking branch 'drm/drm-next' into msm-next

Sun, 29 Jun 2025 02:54:49 +0000

Merge remote-tracking branch 'drm/drm-next' into msm-nextBack-merge drm-next to (indirectly) get arm-smmu updates for makingstall-on-fault more reliable.Signed-off-by: Rob Clark List of files: /linux/scripts/git-resolve.sh

886178a33a30fe685e926d84f531243982fb3c70 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after rc3

Thu, 26 Jun 2025 16:48:06 +0000

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after rc3Cross-merge BPF, perf and other fixes after downstream PRs.It restores BPF CI to green after critical fixcommit bc4394e5e79c ("perf: Fix the throttle error of some clock events")No conflicts.Signed-off-by: Alexei Starovoitov List of files: /linux/scripts/git-resolve.sh

535de528015b56e34a40a8e1eb1629fadf809a84 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Thu, 12 Jun 2025 17:08:24 +0000

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

c598d5eb9fb331ba17bc9ad67ae9a2231ca5aca5 - Merge drm/drm-next into drm-misc-next

Wed, 11 Jun 2025 07:01:34 +0000

Merge drm/drm-next into drm-misc-nextBackmerging to forward to v6.16-rc1Signed-off-by: Thomas Zimmermann List of files: /linux/scripts/git-resolve.sh

86e2d052c2320bf12571a5d96b16c2745e1cfc5e - Merge drm/drm-next into drm-xe-next

Mon, 09 Jun 2025 16:26:55 +0000

Merge drm/drm-next into drm-xe-nextBackmerging to bring in 6.16Signed-off-by: Thomas Hellström List of files: /linux/scripts/git-resolve.sh

34c55367af96f62e89221444f04487440ebc6487 - Merge drm/drm-next into drm-intel-next

Mon, 09 Jun 2025 09:40:46 +0000

Merge drm/drm-next into drm-intel-nextSync to v6.16-rc1, among other things to get the fixed size GENMASK_U*()and BIT_U*() macros.Signed-off-by: Jani Nikula List of files: /linux/scripts/git-resolve.sh

c26f4fbd58375bd6ef74f95eb73d61762ad97c59 - Merge tag 'char-misc-6.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Fri, 06 Jun 2025 18:50:47 +0000

Merge tag 'char-misc-6.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-miscPull char / misc / iio driver updates from Greg KH: "Here is the big char/misc/iio and other small driver subsystem pull request for 6.16-rc1. Overall, a lot of individual changes, but nothing major, just the normal constant forward progress of new device support and cleanups to existing subsystems. Highlights in here are: - Large IIO driver updates and additions and device tree changes - Android binder bugfixes and logfile fixes - mhi driver updates - comedi driver updates - counter driver updates and additions - coresight driver updates and additions - echo driver removal as there are no in-kernel users of it - nvmem driver updates - spmi driver updates - new amd-sbi driver "subsystem" and drivers added - rust miscdriver binding documentation fix - other small driver fixes and updates (uio, w1, acrn, hpet, xillybus, cardreader drivers, fastrpc and others) All of these have been in linux-next for quite a while with no reported problems"* tag 'char-misc-6.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (390 commits) binder: fix yet another UAF in binder_devices counter: microchip-tcb-capture: Add watch validation support dt-bindings: iio: adc: Add ROHM BD79100G iio: adc: add support for Nuvoton NCT7201 dt-bindings: iio: adc: add NCT7201 ADCs iio: chemical: Add driver for SEN0322 dt-bindings: trivial-devices: Document SEN0322 iio: adc: ad7768-1: reorganize driver headers iio: bmp280: zero-init buffer iio: ssp_sensors: optimalize -> optimize HID: sensor-hub: Fix typo and improve documentation iio: admv1013: replace redundant ternary operator with just len iio: chemical: mhz19b: Fix error code in probe() iio: adc: at91-sama5d2: use IIO_DECLARE_BUFFER_WITH_TS iio: accel: sca3300: use IIO_DECLARE_BUFFER_WITH_TS iio: adc: ad7380: use IIO_DECLARE_DMA_BUFFER_WITH_TS iio: adc: ad4695: rename AD4695_MAX_VIN_CHANNELS iio: adc: ad4695: use IIO_DECLARE_DMA_BUFFER_WITH_TS iio: introduce IIO_DECLARE_BUFFER_WITH_TS macros iio: make IIO_DMA_MINALIGN minimum of 8 bytes ... List of files: /linux/scripts/git-resolve.sh

d0fd663a0b0a64436a92ef8321de5e9d049b6e04 - git-resolve: add SPDX and copyright line

Mon, 21 Apr 2025 13:59:15 +0000

git-resolve: add SPDX and copyright lineI forgot to include it when I've originally submitted the script.Fixes: 7ae52a3d7f51 ("scripts: Add git-resolve tool for full SHA-1 resolution")Signed-off-by: Sasha Levin Link: https://lore.kernel.org/r/20250421135915.1915062-1-sashal@kernel.orgSigned-off-by: Greg Kroah-Hartman List of files: /linux/scripts/git-resolve.sh

7ae52a3d7f511c95dad414441db7cfdd6356d88a - scripts: Add git-resolve tool for full SHA-1 resolution

Tue, 11 Mar 2025 16:53:36 +0000

scripts: Add git-resolve tool for full SHA-1 resolutionIntroduce git-resolve.sh, a tool that resolves short git commit IDs to theirfull SHA-1 hash. This is particularly useful for navigating references in commitmessages and verifying Fixes tags.When faced with ambiguous commit IDs or imprecise references in messages,this tool can help by resolving commit hashes based on not just the IDitself but also the commit subject, making it more robust than standardgit rev-parse.This is especially valuable for maintainers who need to verify Fixes tagsor cross-reference commits. Unlike proposals to add dates to Fixes tags(which would break existing tooling), this script provides a way todisambiguate commits without changing the established tag format.The script includes several features:- Resolves short commit IDs to full SHA-1 hashes- Uses commit subjects to disambiguate between multiple potential matches- Supports wildcard patterns in subjects with ellipsis (...)- Provides a force mode to attempt resolution by subject when ID lookup fails- Includes comprehensive self-testsSigned-off-by: Sasha Levin Reviewed-by: Kees Cook Link: https://lore.kernel.org/r/20250311165336.248120-1-sashal@kernel.orgSigned-off-by: Greg Kroah-Hartman List of files: /linux/scripts/git-resolve.sh