summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorWolfram Sang <wsa+renesas@sang-engineering.com>2024-08-09 15:28:08 +0200
committerWolfram Sang <wsa+renesas@sang-engineering.com>2024-08-09 15:28:08 +0200
commit01a620d491592ead12eca039fe1c9e74908c35cf (patch)
tree15271737ef24a7375f01eb928595ea3ba13c13ad /Makefile
parent74b0666f97f9455bc799405b7874df62fcb66bae (diff)
parent9ba48db9f77ce0001dbb882476fa46e092feb695 (diff)
downloadlinux-01a620d491592ead12eca039fe1c9e74908c35cf.tar.gz
linux-01a620d491592ead12eca039fe1c9e74908c35cf.zip
Merge tag 'i2c-host-fixes-6.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current
Two fixes on the Qualcomm GENI I2C controller are cleaning up the error exit patch in the runtime_resume() function. The first is disabling the clock, the second disables the icc on the way out.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 8ad55d6e7b60..44c02a6f60a1 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
VERSION = 6
PATCHLEVEL = 11
SUBLEVEL = 0
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc2
NAME = Baby Opossum Posse
# *DOCUMENTATION*