From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Arnd Bergmann <arnd@arndb•de>
Cc: Akshay Gupta <akshay.gupta@amd•com>,
Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
Jean Delvare <jdelvare@suse•de>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the char-misc tree with the char-misc.current tree
Date: Fri, 24 Oct 2025 12:49:06 +1100 [thread overview]
Message-ID: <20251024124906.70323e51@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1476 bytes --]
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-10-24 1:49 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-24 1:49 Stephen Rothwell [this message]
2025-10-24 5:24 ` linux-next: manual merge of the char-misc tree with the char-misc.current tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2026-05-25 15:07 Mark Brown
2025-11-14 3:32 Stephen Rothwell
2025-11-14 19:10 ` Dinh Nguyen
2021-12-06 3:49 Stephen Rothwell
2021-12-06 13:43 ` Andy Shevchenko
2021-12-06 16:17 ` Ralph Siemsen
2021-12-06 16:44 ` Andy Shevchenko
2021-12-13 9:18 ` Greg KH
2022-01-07 23:18 ` Kees Cook
2019-10-18 3:26 Stephen Rothwell
2019-10-18 10:06 ` Greg KH
2019-04-03 3:56 Stephen Rothwell
2019-04-03 5:06 ` Srinivas Kandagatla
2019-04-03 6:39 ` Bo YU
2018-12-04 4:35 Stephen Rothwell
2018-12-04 7:42 ` Greg KH
2018-12-04 8:46 ` Dexuan Cui
2018-12-10 9:47 ` Greg KH
2018-12-10 18:51 ` Dexuan Cui
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251024124906.70323e51@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akshay.gupta@amd$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=greg@kroah$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=jdelvare@suse$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox