linux-next: manual merge of the device-id tree with the gpio tree

linux-next: manual merge of the device-id tree with the gpio tree

[Mark Brown]

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

Hi all,

Today's linux-next merge of the device-id tree got a conflict in:

  drivers/gpio/gpio-shared-proxy.c

between commit:

  163ba8782d521 ("Replace <linux/mod_devicetable.h> by more specific <linux/device-id/*.h> (c files)")

from the device-id tree and commit:

  efecde8a254d1 ("gpio: shared-proxy: always serialize with a sleeping mutex")

from the device-id 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/gpio/gpio-shared-proxy.c
index 10ca2ef77ef34,d3625b8d0ced2..0000000000000
--- a/drivers/gpio/gpio-shared-proxy.c
+++ b/drivers/gpio/gpio-shared-proxy.c
@@@ -9,10 -9,7 +9,9 @@@
  #include <linux/err.h>
  #include <linux/gpio/consumer.h>
  #include <linux/gpio/driver.h>
 +#include <linux/lockdep.h>
- #include <linux/mod_devicetable.h>
  #include <linux/module.h>
 +#include <linux/mutex.h>
  #include <linux/string_choices.h>
  #include <linux/types.h>
  

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

Re: linux-next: manual merge of the device-id tree with the gpio tree

[Uwe Kleine-König]

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

Hello Mark, hello Bartosz,

On Wed, Jul 01, 2026 at 03:35:29PM +0100, Mark Brown wrote:
> Today's linux-next merge of the device-id tree got a conflict in:
> 
>   drivers/gpio/gpio-shared-proxy.c
> 
> between commit:
> 
>   163ba8782d521 ("Replace <linux/mod_devicetable.h> by more specific <linux/device-id/*.h> (c files)")
> 
> from the device-id tree and commit:
> 
>   efecde8a254d1 ("gpio: shared-proxy: always serialize with a sleeping mutex")
> 
> from the device-id 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/gpio/gpio-shared-proxy.c
> index 10ca2ef77ef34,d3625b8d0ced2..0000000000000
> --- a/drivers/gpio/gpio-shared-proxy.c
> +++ b/drivers/gpio/gpio-shared-proxy.c
> @@@ -9,10 -9,7 +9,9 @@@
>   #include <linux/err.h>
>   #include <linux/gpio/consumer.h>
>   #include <linux/gpio/driver.h>
>  +#include <linux/lockdep.h>
> - #include <linux/mod_devicetable.h>
>   #include <linux/module.h>
>  +#include <linux/mutex.h>
>   #include <linux/string_choices.h>
>   #include <linux/types.h>

thanks to Mark for the notification, the merge resolution looks right.

Bartosz, I intend to send the changes that are currently in the
device-id branch to Linus for 7.2-rc2. So it's probably on you to notify
Linus about the merge conflict. (Or you rebase on 7.2-rc2 until then.)

Best regards
Uwe

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