Merge remote-tracking branch 'trivial/for-next'

diff --cc drivers/base/core.c
Simple merge

diff --cc drivers/dma/dw/core.c
Simple merge

diff --cc drivers/dma/ioat/init.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem_fence.c
Simple merge

diff --cc drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c
Simple merge

diff --cc drivers/media/platform/exynos4-is/fimc-is.c
Simple merge

diff --cc drivers/media/platform/exynos4-is/mipi-csis.c
Simple merge

diff --cc drivers/phy/phy-core.c
Simple merge

diff --cc drivers/rtc/rtc-rx8025.c
Simple merge

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

diff --cc drivers/usb/dwc3/ep0.c
Simple merge

diff --cc drivers/usb/dwc3/gadget.c
Simple merge

diff --cc drivers/usb/gadget/legacy/Kconfig
Simple merge

diff --cc drivers/usb/host/uhci-q.c
Simple merge

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

diff --cc kernel/time/timekeeping.c
Simple merge

diff --cc lib/842/842_decompress.c
Simple merge

diff --cc mm/balloon_compaction.c
Simple merge

diff --cc net/openvswitch/vport-geneve.c
Simple merge