linux-next: manual merge of the pinctrl-renesas tree with the pinctrl tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the pinctrl-renesas tree got conflicts in:

  drivers/pinctrl/renesas/pinctrl-rza2.c
  drivers/pinctrl/renesas/pinctrl-rzg2l.c
  drivers/pinctrl/renesas/pinctrl-rzv2m.c

between commit:

  060f03e95454 ("pinctrl: Explicitly include correct DT includes")

from the pinctrl tree and commits:

  848f700dabda ("pinctrl: renesas: rzg2l: Fix NULL pointer dereference in rzg2l_dt_subnode_to_map()")
  ca63f2ef6a16 ("pinctrl: renesas: rzv2m: Fix NULL pointer dereference in rzv2m_dt_subnode_to_map()")
  1eb1e00e5d99 ("pinctrl: renesas: rza2: Add lock around pinctrl_generic{{add,remove}_group,{add,remove}_function}")

from the pinctrl-renesas 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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/pinctrl/renesas/pinctrl-rza2.c
index 0b454a31c4bd,5591ddf16fdf..000000000000
--- a/drivers/pinctrl/renesas/pinctrl-rza2.c
+++ b/drivers/pinctrl/renesas/pinctrl-rza2.c
@@@ -14,9 -14,9 +14,10 @@@
  #include <linux/gpio/driver.h>
  #include <linux/io.h>
  #include <linux/module.h>
+ #include <linux/mutex.h>
 -#include <linux/of_device.h>
 +#include <linux/of.h>
  #include <linux/pinctrl/pinmux.h>
 +#include <linux/platform_device.h>
  
  #include "../core.h"
  #include "../pinmux.h"
diff --cc drivers/pinctrl/renesas/pinctrl-rzg2l.c
index 4f34f8f24bde,cdf183250c1e..000000000000
--- a/drivers/pinctrl/renesas/pinctrl-rzg2l.c
+++ b/drivers/pinctrl/renesas/pinctrl-rzg2l.c
@@@ -11,9 -11,9 +11,10 @@@
  #include <linux/interrupt.h>
  #include <linux/io.h>
  #include <linux/module.h>
+ #include <linux/mutex.h>
 -#include <linux/of_device.h>
 +#include <linux/of.h>
  #include <linux/of_irq.h>
 +#include <linux/platform_device.h>
  #include <linux/seq_file.h>
  #include <linux/spinlock.h>
  
diff --cc drivers/pinctrl/renesas/pinctrl-rzv2m.c
index c73784b8b4ba,aa9dbbddff21..000000000000
--- a/drivers/pinctrl/renesas/pinctrl-rzv2m.c
+++ b/drivers/pinctrl/renesas/pinctrl-rzv2m.c
@@@ -14,8 -14,8 +14,9 @@@
  #include <linux/gpio/driver.h>
  #include <linux/io.h>
  #include <linux/module.h>
+ #include <linux/mutex.h>
 -#include <linux/of_device.h>
 +#include <linux/of.h>
 +#include <linux/platform_device.h>
  #include <linux/spinlock.h>
  
  #include <linux/pinctrl/consumer.h>

Attachment: pgp2m1FFMh_uW.pgp
Description: OpenPGP digital signature