Message ID | 20200629111458.1661446b@canb.auug.org.au (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | linux-next: manual merge of the drm-misc tree with Linus' tree | expand |
diff --cc drivers/gpu/drm/nouveau/dispnv04/crtc.c index 640738f3196c,cc6ab3c2eec7..000000000000 --- a/drivers/gpu/drm/nouveau/dispnv04/crtc.c diff --cc drivers/gpu/drm/nouveau/dispnv04/overlay.c index 6248fd1dbc6d,9529bd9053e7..000000000000 --- a/drivers/gpu/drm/nouveau/dispnv04/overlay.c diff --cc drivers/gpu/drm/nouveau/dispnv50/base507c.c index 511258bfbcbc,b60aa987d7b4..000000000000 --- a/drivers/gpu/drm/nouveau/dispnv50/base507c.c diff --cc drivers/gpu/drm/nouveau/dispnv50/wndw.c index 99b9b681736d,ee0fd817185e..000000000000 --- a/drivers/gpu/drm/nouveau/dispnv50/wndw.c diff --cc drivers/gpu/drm/nouveau/nouveau_dmem.c index e5c230d9ae24,f13086a32f0f..000000000000 --- a/drivers/gpu/drm/nouveau/nouveau_dmem.c diff --cc drivers/gpu/drm/nouveau/nouveau_fbcon.c index 3d11b84d4cf9,1341c6fca3ed..000000000000 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c