linux-kernel - Re: [git pull] drm merge for rc1 (part 1)

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: <CA+55aFzuHdT5NLGTd-+2hPvV4uzWxT+dTFZ5kCrWS+8-1zDtOA@mail.gmail.com>
Date:	Wed, 3 Oct 2012 23:51:43 -0700
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Dave Airlie <airlied@...ux.ie>
Cc:	DRI mailing list <dri-devel@...ts.freedesktop.org>,
	linux-kernel@...r.kernel.org, David Howells <dhowells@...hat.com>
Subject: Re: [git pull] drm merge for rc1 (part 1)

On Wed, Oct 3, 2012 at 9:08 PM, Dave Airlie <airlied@...ux.ie> wrote:
>
> So this pull is for my drm-next-merged branch which is my drm-next branch
> merged with your tree, and some fixups applied to the merge.

Ok, as usual I actually wanted to do the merge myself despite the
annoying conflicts (this *really* is the last time I will ever accept
any header file "cleanups" - they simply aren't worth the pain).

My resolution was largely the same as yours, and I used your
pre-merged branch to check the end result. I do like being able to
double-check, and see the non-data-conflicting semantics conflicts
too.

Pushed out,

                Linus
--
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/