Re: linux-next: manual merge of the gpio-brgl tree with the usb tree

[Greg Kroah-Hartman]

On Thu, Sep 18, 2025 at 03:15:45PM +0100, Mark Brown wrote:
> 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



Looks good to me, thanks!

greg k-h