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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAKMK7uHJf6C99kNFybBhv3kXKze8x+YRDSHNycOfbY_QiSC7HA@mail.gmail.com>
Date:	Mon, 21 Jan 2013 09:43:40 +0100
From:	Daniel Vetter <daniel.vetter@...ll.ch>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Dave Airlie <airlied@...ux.ie>
Subject: 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 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 <sfr@...b.auug.org.au> 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@...b.auug.org.au



-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/