summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorJonathan Cameron <Jonathan.Cameron@huawei.com>2026-03-22 15:20:42 +0300
committerJonathan Cameron <Jonathan.Cameron@huawei.com>2026-03-22 15:20:42 +0300
commit9e4e86a604dfd06402933467578c4b79f5412b2c (patch)
tree5cf2d962b699987c8a785e35a5f5c5f450532c0a /init
parente8b83499b4cbc8b989f7cd6aaa893b669326e93c (diff)
parentf338e77383789c0cae23ca3d48adcc5e9e137e3c (diff)
downloadlinux-9e4e86a604dfd06402933467578c4b79f5412b2c.tar.xz
Merge tag 'v7.0-rc4' into togreg
Linux 7.0-rc4 Required for the ds4422 series which is build upon; 5187e03b817c ("iio: dac: ds4424: reject -128 RAW value")
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig
index c25869cf59c1..444ce811ea67 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -153,7 +153,7 @@ config CC_HAS_COUNTED_BY_PTR
config CC_HAS_BROKEN_COUNTED_BY_REF
bool
# https://github.com/llvm/llvm-project/issues/182575
- default y if CC_IS_CLANG && CLANG_VERSION < 220000
+ default y if CC_IS_CLANG && CLANG_VERSION < 220100
config CC_HAS_MULTIDIMENSIONAL_NONSTRING
def_bool $(success,echo 'char tag[][4] __attribute__((__nonstring__)) = { };' | $(CC) $(CLANG_FLAGS) -x c - -c -o /dev/null -Werror)
@@ -1902,7 +1902,7 @@ config IO_URING_MOCK_FILE
default n
depends on IO_URING
help
- Enable mock files for io_uring subststem testing. The ABI might
+ Enable mock files for io_uring subsystem testing. The ABI might
still change, so it's still experimental and should only be enabled
for specific test purposes.