Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
Simple merge

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

diff --cc security/selinux/hooks.c
Simple merge