Merge tag 'v4.16-rc5' into devel

Linux 4.16-rc5 merged into the GPIO devel branch to resolve
a nasty conflict between fixes and devel in the RCAR driver.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc drivers/gpio/gpio-rcar.c
index e5b0dbe43c018601579c7e9a3da39511f7c6f87e,ebaea8b1594b7fc4919a71fdac7ed9ef8418df7b..350390c0b29098904acd0e9510b7640095f95cce
--- 1/drivers/gpio/gpio-rcar.c
--- 2/drivers/gpio/gpio-rcar.c
+++ b/drivers/gpio/gpio-rcar.c
@@@ -47,11 -36,9 +46,10 @@@ struct gpio_rcar_priv 
        struct platform_device *pdev;
        struct gpio_chip gpio_chip;
        struct irq_chip irq_chip;
-       struct clk *clk;
        unsigned int irq_parent;
+       atomic_t wakeup_path;
        bool has_both_edge_trigger;
-       bool needs_clk;
 +      struct gpio_rcar_bank_info bank_info;
  };
  
  #define IOINTSEL 0x00 /* General IO/Interrupt Switching Register */
@@@ -547,15 -516,9 +528,18 @@@ static int gpio_rcar_suspend(struct dev
  {
        struct gpio_rcar_priv *p = dev_get_drvdata(dev);
  
 +      p->bank_info.iointsel = gpio_rcar_read(p, IOINTSEL);
 +      p->bank_info.inoutsel = gpio_rcar_read(p, INOUTSEL);
 +      p->bank_info.outdt = gpio_rcar_read(p, OUTDT);
 +      p->bank_info.intmsk = gpio_rcar_read(p, INTMSK);
 +      p->bank_info.posneg = gpio_rcar_read(p, POSNEG);
 +      p->bank_info.edglevel = gpio_rcar_read(p, EDGLEVEL);
 +      if (p->has_both_edge_trigger)
 +              p->bank_info.bothedge = gpio_rcar_read(p, BOTHEDGE);
 +
+       if (atomic_read(&p->wakeup_path))
+               device_set_wakeup_path(dev);
+ 
        return 0;
  }
  

diff --cc drivers/watchdog/Kconfig
Simple merge