diff options
| author |   Simona Vetter <simona.vetter@ffwll.ch> | 2025-01-23 14:39:49 +0100 |
|---|---|---|
| committer | Simona Vetter <simona.vetter@ffwll.ch> | 2025-01-23 14:42:21 +0100 |
| commit | 07c5b277208cf9a9e9cf31bf0143977d7f030aa1 (patch) | |
| tree | 8c30e64d4b9bbb433e50785fb40860ee5c46a4eb /scripts/lib/kdoc/kdoc_files.py | |
| parent | Merge tag 'drm-misc-next-fixes-2025-01-16' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next (diff) | |
| parent | Linux 6.13 (diff) | |
| download | linux-rng-07c5b277208cf9a9e9cf31bf0143977d7f030aa1.tar.xz linux-rng-07c5b277208cf9a9e9cf31bf0143977d7f030aa1.zip | |
Merge v6.13 into drm-next
A regression was caused by commit e4b5ccd392b9 ("drm/v3d: Ensure job
pointer is set to NULL after job completion"), but this commit is not
yet in next-fixes, fast-forward it.
Note that this recreates Linus merge in 96c84703f1cf ("Merge tag
'drm-next-2025-01-17' of https://gitlab.freedesktop.org/drm/kernel")
because I didn't want to backmerge a random point in the merge window.
Signed-off-by: Simona Vetter <simona.vetter@ffwll.ch>
Diffstat (limited to 'scripts/lib/kdoc/kdoc_files.py')
0 files changed, 0 insertions, 0 deletions