summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2025-09-29 12:13:00 +0300
committerJani Nikula <jani.nikula@intel.com>2025-09-29 12:13:00 +0300
commit996ad9cd3e1eee1183aba9c7c4d1ada4a62c6f9a (patch)
tree4021ff1544533eb526d75bbdefd2cc598c45f6c3 /Makefile
parent924adb0bbdd8fef25fd229c76e3f602c3e8752ee (diff)
parent62bea0e1d5c71a3d9c953d4bbbae79428d0ba05c (diff)
downloadlinux-next-996ad9cd3e1eee1183aba9c7c4d1ada4a62c6f9a.tar.gz
linux-next-996ad9cd3e1eee1183aba9c7c4d1ada4a62c6f9a.zip
Merge drm/drm-next into drm-intel-next
Backmerge to sync with drm/xe changes. Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index d1adb78c3596..9771619ac596 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
VERSION = 6
PATCHLEVEL = 17
SUBLEVEL = 0
-EXTRAVERSION = -rc2
+EXTRAVERSION = -rc6
NAME = Baby Opossum Posse
# *DOCUMENTATION*