Merge tag 'v4.9.235' into khadas-vims-4.9.y

This is the 4.9.235 stable release

diff --cc Makefile
Simple merge

diff --cc drivers/base/power/main.c
index 7637314,d707cd1..79d7d7b
--- 1/drivers/base/power/main.c
--- 2/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@@ -1368,18 -1366,19 +1368,22 @@@ static int __device_suspend(struct devi
        }
  
        /*
-        * If a device configured to wake up the system from sleep states
-        * has been suspended at run time and there's a resume request pending
-        * for it, this is equivalent to the device signaling wakeup, so the
-        * system suspend operation should be aborted.
+        * Wait for possible runtime PM transitions of the device in progress
+        * to complete and if there's a runtime resume request pending for it,
+        * resume it before proceeding with invoking the system-wide suspend
+        * callbacks for it.
+        *
+        * If the system-wide suspend callbacks below change the configuration
+        * of the device, they must disable runtime PM for it or otherwise
+        * ensure that its runtime-resume callbacks will not be confused by that
+        * change in case they are invoked going forward.
         */
-       if (pm_runtime_barrier(dev) && device_may_wakeup(dev))
-               pm_wakeup_event(dev, 0);
+       pm_runtime_barrier(dev);
  
        if (pm_wakeup_pending()) {
 +              pm_get_active_wakeup_sources(suspend_abort,
 +                      MAX_SUSPEND_ABORT_LEN);
 +              log_suspend_abort_reason(suspend_abort);
                dev->power.direct_complete = false;
                async_error = -EBUSY;
                goto Complete;

diff --cc drivers/md/dm-table.c
Simple merge

diff --cc drivers/scsi/ufs/ufshcd.c
Simple merge

diff --cc drivers/usb/core/quirks.c
Simple merge

diff --cc drivers/usb/host/xhci-hub.c
Simple merge

diff --cc drivers/video/console/fbcon.c
Simple merge

diff --cc fs/ext4/super.c
Simple merge

diff --cc fs/fs-writeback.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc net/ipv6/ip6_tunnel.c
Simple merge