Gustavo Padovan d98c71dadc Merge drm-upstream/drm-next into drm-misc-next ... We got a few conflicts in drm_atomic.c after merging the DRM writeback support, now we need a backmerge to unlock develop development on drm-misc-next. Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>		2018-06-20 13:22:22 -03:00
..
asm-generic	Merge branch 'parisc-4.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux	2018-04-12 17:07:04 -07:00
drm	Merge drm-upstream/drm-next into drm-misc-next	2018-06-20 13:22:22 -03:00
linux	urgent i686 mmap fix for drm drivers	2018-05-18 14:08:53 +10:00
misc	ocxl: Add get_metadata IOCTL to share OCXL information to userspace	2018-03-02 13:02:14 +11:00
mtd	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00
rdma	uapi: Fix SPDX tags for files referring to the 'OpenIB.org' license	2018-04-23 11:10:33 -04:00
scsi	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00
sound	ASoC: soc-generic-dmaengine-pcm: Fix sparse warnings	2018-02-26 11:05:12 +00:00
video	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00
xen	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00