diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2024-08-27 15:09:45 +0300 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2024-08-27 15:09:45 +0300 |
commit | 4461e9e5c374f8c11fee8e4a0e3290b072cfd538 (patch) | |
tree | 3bb5c91e53e98e6b80020e63d2d3ec14f94c0533 /scripts/Makefile.modfinal | |
parent | 3f53d7e442197b7e7d56b470b02dfd37a8bc5c46 (diff) | |
parent | 5be63fc19fcaa4c236b307420483578a56986a37 (diff) | |
download | linux-4461e9e5c374f8c11fee8e4a0e3290b072cfd538.tar.xz |
Merge v6.11-rc5 into drm-next
amdgpu pr conconflicts due to patches cherry-picked to -fixes, I might
as well catch up with a backmerge and handle them all. Plus both misc
and intel maintainers asked for a backmerge anyway.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'scripts/Makefile.modfinal')
-rw-r--r-- | scripts/Makefile.modfinal | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Makefile.modfinal b/scripts/Makefile.modfinal index 1fa98b5e952b..306a6bb86e4d 100644 --- a/scripts/Makefile.modfinal +++ b/scripts/Makefile.modfinal @@ -62,7 +62,7 @@ endif targets += $(modules:%.o=%.ko) $(modules:%.o=%.mod.o) -# Add FORCE to the prequisites of a target to force it to be always rebuilt. +# Add FORCE to the prerequisites of a target to force it to be always rebuilt. # --------------------------------------------------------------------------- PHONY += FORCE |