Conflicts: linux-core/Makefile linux-core/Makefile.kernel linux-core/drm_compat.h linux-core/nouveau_sgdma.c shared-core/nv50_graph.c