linux-kernel - Re: linux-next: build failure after merge of 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]

Date:	Mon, 24 Sep 2012 21:58:34 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Daniel Vetter <daniel@...ll.ch>
Cc:	Dave Airlie <airlied@...ux.ie>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Daniel Vetter <daniel.vetter@...ll.ch>,
	Wang Xingchao <xingchao.wang@...el.com>
Subject: Re: linux-next: build failure after merge of the drm tree

Hi Daniel,

On Mon, 24 Sep 2012 13:31:54 +0200 Daniel Vetter <daniel@...ll.ch> wrote:
>
> Looks good. I've known about this issue and tried to improve matters by
> applying the patch to both trees (to at least force a conflict), but not
> even with that patch applied in my drm-intel-next queue I get a proper
> conflict. I guess I need to do a proper backmerge.
> 
> Fixup patch looks good for now.

If that is all that is needed, just make sure Linus is informed of the
merge conflict fix when he merged the drm tree.  If there is more, it is
up to you and Dave.  If you do a back merge, make sure that it is
properly commented.

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

Content of type "application/pgp-signature" skipped