linux-next: manual merge of the char-misc tree with the char-misc.current tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in:

  drivers/misc/amd-sbi/Kconfig

between commit:

  70ad06df73a9 ("misc: amd-sbi: Clarify that this is a BMC driver")

from the char-misc.current tree and commit:

  5c7dddd7360b ("misc: amd-sbi: Add support for SB-RMI over I3C")

from the char-misc tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/misc/amd-sbi/Kconfig
index ab594908cb4a,acf0450ba220..000000000000
--- 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.

Attachment: pgp5n3MqnfsbJ.pgp
Description: OpenPGP digital signature