diff options
| author | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2026-05-12 11:16:35 +0300 |
|---|---|---|
| committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2026-05-12 11:16:35 +0300 |
| commit | 8edf8b09fc44990977b3fbcb708035b1740d0b7e (patch) | |
| tree | 0069cfbd4a05bd6c4c6057c3a36d0849f8a7414c /scripts/kernel-doc | |
| parent | 5ba54393dcd7adf75a9f39f5a933b1538349cad5 (diff) | |
| parent | f96538285cfdbb3acf5e3356e0bb88c38815790b (diff) | |
| download | linux-8edf8b09fc44990977b3fbcb708035b1740d0b7e.tar.xz | |
Merge drm/drm-next into drm-intel-gt-next
Backmerging to pull in commit 5401b9adebc9 ("i915: don't use
a vma that didn't match the context VM") to revert it.
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'scripts/kernel-doc')
| l--------- | scripts/kernel-doc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc index 3b6ef807791a..9cc1459ffcdb 120000 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc @@ -1 +1 @@ -kernel-doc.py
\ No newline at end of file +../tools/docs/kernel-doc
\ No newline at end of file |