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 <gregkh@linuxfoundation.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/misc/amd-sbi/Kconfig
index acf0450ba220179abb77e23b73f15cc376aa01e3,ab594908cb4ae8ccef31dfb1dc4ed7ea8a7d5785..be022c71a90c124717108939c847680d990b2df8
--- 1/drivers/misc/amd-sbi/Kconfig
--- 2/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.