linux-next: manual merge of the akpm tree with the drm tree

Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in: drivers/gpu/drm/nouveau/nouveau_ttm.c between commits: 524883bb4846 ("drm/nouveau/ttm: convert to DMA API") b31cf78b9324 ("drm/nouveau/ttm: set the DMA mask for platform devices") from the drm tree and patch: "nou

Re: linux-next: manual merge of the akpm tree with the drm tree

Hi all, I'm working on some follow-up patches for the drm fb helper library already, and fixing up the panic handling is on the plan already. And since the fb helper has its own panic notifier anyway (simply unblanking is not good enough to display an oops on a kms device) I think we should simply

linux-next: manual merge of the akpm tree with the drm tree

Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in drivers/gpu/drm/drm_fb_helper.c between commit 848499032504 ("drm: add drm_modeset_lock|unlock_all") from the drm tree and commit "drivers/gpu/drm/drm_fb_helper.c: avoid sleeping in unblank_screen() if oops in progress" from th