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 return without doing anything from our
->fb_blank if an oops is in progress.

So please drop the patch from the akpm tree, I'll take care of this
(and reply to the original patch submission with my plan).

Thanks, Daniel

On Mon, Jan 21, 2013 at 6:43 AM, Stephen Rothwell [off-list ref] wrote:

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 the akpm tree.

I can't see an easy way to resolve these, so I just dropped the akpm tree
patch.

--
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch