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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 767 bytes --]

Hi all,

Today's linux-next merge of the gpio-brgl tree got a conflict in:

  drivers/gpio/gpio-ljca.c

between commit:

  1034cc423f1b ("gpio: update Intel LJCA USB GPIO driver")

from the usb tree and commit:

  da2ad5fe2292 ("gpio: ljca: Convert to platform remove callback returning void")

from the gpio-brgl tree.

I fixed it up (I just used the former version) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Bartosz Golaszewski]

On Mon, 16 Oct 2023 at 04:42, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the gpio-brgl tree got a conflict in:
>
>   drivers/gpio/gpio-ljca.c
>
> between commit:
>
>   1034cc423f1b ("gpio: update Intel LJCA USB GPIO driver")
>
> from the usb tree and commit:
>
>   da2ad5fe2292 ("gpio: ljca: Convert to platform remove callback returning void")
>
> from the gpio-brgl tree.
>
> I fixed it up (I just used the former version) 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

Looks good, the latter patch converts the driver to using the
auxiliary bus whose .remove() already returns void.

Bart

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

[Uwe Kleine-König]

[-- Attachment #1: Type: text/plain, Size: 1135 bytes --]

Hello,

On Mon, Oct 16, 2023 at 01:41:59PM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the gpio-brgl tree got a conflict in:
> 
>   drivers/gpio/gpio-ljca.c
> 
> between commit:
> 
>   1034cc423f1b ("gpio: update Intel LJCA USB GPIO driver")
> 
> from the usb tree and commit:
> 
>   da2ad5fe2292 ("gpio: ljca: Convert to platform remove callback returning void")
> 
> from the gpio-brgl tree.
> 
> I fixed it up (I just used the former version) 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.

Looks right. As this isn't a platform_driver any more, dropping the
conversion to .remove_new is the right thing.

Thanks
Uwe



-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 546 bytes --]

Hi all,

On Mon, 16 Oct 2023 13:41:59 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> Today's linux-next merge of the gpio-brgl tree got a conflict in:
> 
>   drivers/gpio/gpio-ljca.c
> 
> between commit:
> 
>   1034cc423f1b ("gpio: update Intel LJCA USB GPIO driver")
> 
> from the usb tree and commit:
> 
>   da2ad5fe2292 ("gpio: ljca: Convert to platform remove callback returning void")
> 
> from the gpio-brgl tree.

This is now a conflict between the usb tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Greg KH]

On Thu, Nov 02, 2023 at 11:29:50AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> On Mon, 16 Oct 2023 13:41:59 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > 
> > Today's linux-next merge of the gpio-brgl tree got a conflict in:
> > 
> >   drivers/gpio/gpio-ljca.c
> > 
> > between commit:
> > 
> >   1034cc423f1b ("gpio: update Intel LJCA USB GPIO driver")
> > 
> > from the usb tree and commit:
> > 
> >   da2ad5fe2292 ("gpio: ljca: Convert to platform remove callback returning void")
> > 
> > from the gpio-brgl tree.
> 
> This is now a conflict between the usb tree and Linus' tree.

Thanks, I'll note this in my pull request to Linus.

greg k-h

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

[Mark Brown]

[-- 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 --]

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