linux-kernel - Re: [git pull] drm tree for 4.2

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: <CA+55aFxUaZhGkicH8f=BE5vzKtR3SKXW=j=eVuTxD1baCb_FOA@mail.gmail.com>
Date:	Fri, 26 Jun 2015 13:41:02 -0700
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Dave Airlie <airlied@...il.com>
Cc:	Christian König <deathsimple@...afone.de>,
	Dave Airlie <airlied@...ux.ie>,
	LKML <linux-kernel@...r.kernel.org>,
	DRI mailing list <dri-devel@...ts.freedesktop.org>
Subject: Re: [git pull] drm tree for 4.2

On Fri, Jun 26, 2015 at 1:37 PM, Dave Airlie <airlied@...il.com> wrote:
>
> No generally Linus likes to do his own merges with hints from us.
>
> unless it's really tricky.

Yup. And this time all the merges were trivial. My merge ended up
differing from Dave's simply because of an ordering of statements that
could be done in either direction, and the "natural" direction ended
up depending mainly on which way the merge was done (ie me pulling
Dave's tree, or Dave pulling mine).

I'm running it on my machine now, just waiting for the allmodconfig
build to also finish before pushing it 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/