From: Greg Kroah-Hartman Date: Mon, 27 Oct 2025 06:48:19 +0000 (+0100) Subject: Merge 6.18-rc3 into char-misc-next X-Git-Tag: v6.19-rc1~65^2~63 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c428900703aaa528bf141358551287f87e5b2b93;p=thirdparty%2Fkernel%2Flinux.git Merge 6.18-rc3 into char-misc-next We need the fixes in here, and it resolves a merge conflict in: drivers/misc/amd-sbi/Kconfig Signed-off-by: Greg Kroah-Hartman --- c428900703aaa528bf141358551287f87e5b2b93 diff --cc drivers/misc/amd-sbi/Kconfig index acf0450ba2201,ab594908cb4ae..be022c71a90c1 --- a/drivers/misc/amd-sbi/Kconfig +++ b/drivers/misc/amd-sbi/Kconfig @@@ -2,11 -2,11 +2,13 @@@ config AMD_SBRMI_I2C tristate "AMD side band RMI support" depends on I2C + depends on ARM || ARM64 || COMPILE_TEST select REGMAP_I2C + depends on I3C || !I3C + select REGMAP_I3C if I3C help - Side band RMI over I2C support for AMD out of band management. + Side band RMI over I2C/I3C support for AMD out of band management. + This driver is intended to run on the BMC, not the managed node. This driver can also be built as a module. If so, the module will be called sbrmi-i2c.