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

[Mark Brown]

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: signature.asc
Description: PGP signature