Merge tag 'v4.18.14' into kernel-4.18

Conflicts:
	drivers/base/power/main.c

diff --cc Makefile
Simple merge

diff --cc arch/x86/entry/vdso/Makefile
Simple merge

diff --cc drivers/base/power/main.c
index 352df1f,a690fd4..6590380
--- 1/drivers/base/power/main.c
--- 2/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@@ -1728,9 -1728,7 +1730,10 @@@ static int __device_suspend(struct devi
                pm_wakeup_event(dev, 0);
  
        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/firmware/arm_scmi/perf.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_drm.c
Simple merge

diff --cc drivers/hid/hid-ids.h
Simple merge

diff --cc drivers/mmc/core/host.c
Simple merge

diff --cc fs/inode.c
Simple merge

diff --cc fs/proc/base.c
Simple merge

diff --cc fs/pstore/ram.c
Simple merge

diff --cc fs/xattr.c
Simple merge

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

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

diff --cc kernel/events/core.c
Simple merge

diff --cc kernel/sched/topology.c
Simple merge

diff --cc mm/madvise.c
Simple merge

diff --cc net/netfilter/Kconfig
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge

diff --cc sound/pci/hda/patch_realtek.c
Simple merge