From: Mark Brown <broonie@kernel.org>
To: Bartosz Golaszewski <brgl@bgdev.pl>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Hans de Goede <hansg@kernel.org>,
Israel Cepeda <israel.a.cepeda.lopez@intel.com>,
Lee Jones <lee@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Ming Yu <a0282524688@gmail.com>
Subject: linux-next: manual merge of the gpio-brgl tree with the usb tree
Date: Thu, 18 Sep 2025 15:15:45 +0100 [thread overview]
Message-ID: <aMwUEV6nY4AaJT8X@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 2338 bytes --]
Hi all,
Today's linux-next merge of the gpio-brgl tree got a conflict in:
drivers/i2c/busses/Kconfig
between commit:
daf161343a390 ("i2c: Add Intel USBIO I2C driver")
from the usb tree and commit:
c5cf27dbaeb6e ("i2c: Add Nuvoton NCT6694 I2C support")
from the gpio-brgl 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.
diff --cc drivers/i2c/busses/Kconfig
index 9921fd9ea0983,63a2b5a9abc39..0000000000000
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@@ -1357,17 -1357,16 +1357,27 @@@ config I2C_LJC
This driver can also be built as a module. If so, the module
will be called i2c-ljca.
+ config I2C_NCT6694
+ tristate "Nuvoton NCT6694 I2C adapter support"
+ depends on MFD_NCT6694
+ help
+ If you say yes to this option, support will be included for Nuvoton
+ NCT6694, a USB to I2C interface.
+
+ This driver can also be built as a module. If so, the module will
+ be called i2c-nct6694.
+
+config I2C_USBIO
+ tristate "Intel USBIO I2C Adapter support"
+ depends on USB_USBIO
+ default USB_USBIO
+ help
+ Select this option to enable I2C driver for the INTEL
+ USBIO driver stack.
+
+ This driver can also be built as a module. If so, the module
+ will be called i2c_usbio.
+
config I2C_CP2615
tristate "Silicon Labs CP2615 USB sound card and I2C adapter"
depends on USB
diff --cc drivers/i2c/busses/Makefile
index 401a79c9767e6,fe8cf6325fc98..0000000000000
--- a/drivers/i2c/busses/Makefile
+++ b/drivers/i2c/busses/Makefile
@@@ -135,7 -135,7 +135,8 @@@ obj-$(CONFIG_I2C_GXP) += i2c-gxp.
obj-$(CONFIG_I2C_DIOLAN_U2C) += i2c-diolan-u2c.o
obj-$(CONFIG_I2C_DLN2) += i2c-dln2.o
obj-$(CONFIG_I2C_LJCA) += i2c-ljca.o
+ obj-$(CONFIG_I2C_NCT6694) += i2c-nct6694.o
+obj-$(CONFIG_I2C_USBIO) += i2c-usbio.o
obj-$(CONFIG_I2C_CP2615) += i2c-cp2615.o
obj-$(CONFIG_I2C_PARPORT) += i2c-parport.o
obj-$(CONFIG_I2C_PCI1XXXX) += i2c-mchp-pci1xxxx.o
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-09-18 14:15 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-18 14:15 Mark Brown [this message]
2025-09-18 16:16 ` linux-next: manual merge of the gpio-brgl tree with the usb tree Greg Kroah-Hartman
-- strict thread matches above, loose matches on Subject: below --
2023-10-16 2:41 Stephen Rothwell
2023-10-16 6:46 ` Bartosz Golaszewski
2023-10-16 7:16 ` Uwe Kleine-König
2023-11-02 0:29 ` Stephen Rothwell
2023-11-03 8:45 ` Greg KH
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=aMwUEV6nY4AaJT8X@sirena.org.uk \
--to=broonie@kernel.org \
--cc=a0282524688@gmail.com \
--cc=brgl@bgdev.pl \
--cc=gregkh@linuxfoundation.org \
--cc=hansg@kernel.org \
--cc=israel.a.cepeda.lopez@intel.com \
--cc=lee@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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