linux-kernel - Re: [git pull] drm main pull for 3.4-rc1

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAPM=9txsTTyEaCM3Jas_WyXPCS0wgXttfFuUhQ6_6kn90t=MtA@mail.gmail.com>
Date:	Wed, 21 Mar 2012 17:47:35 +0000
From:	Dave Airlie <airlied@...il.com>
To:	InKi Dae <daeinki@...il.com>
Cc:	Dave Airlie <airlied@...ux.ie>, torvalds@...ux-foundation.org,
	linux-kernel@...r.kernel.org,
	DRI mailing list <dri-devel@...ts.freedesktop.org>
Subject: Re: [git pull] drm main pull for 3.4-rc1

On Wed, Mar 21, 2012 at 5:31 PM, InKi Dae <daeinki@...il.com> wrote:
> Hi Linus,
>
> now mainline has a duplicated patch set for exynos drm driver so
> please revert the patch below from mainline before merging with
> drm-next to avoid conflict.
> subject: drm exynos: use drm_fb_helper_set_par directly
> commit id: 34418c25d64844625118b5eedc493f7904d77659
>
> this patch had already been included in Dave's drm-next. I am sorry to trouble.

Inki it shouldn't be a problem, Linus can resolve conflicts fine. If
there is any.

Dave.
--
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/