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 for Android: free password hash cracker in your pocket

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

Message-ID: <CAPM=9twQLZmm-fh35gpwjX=c=A1Mvf1zeqJ-EZDMNxr+EWa_Og@mail.gmail.com>
Date:	Sat, 27 Jun 2015 06:37:55 +1000
From:	Dave Airlie <airlied@...il.com>
To:	Christian König <deathsimple@...afone.de>
Cc:	Dave Airlie <airlied@...ux.ie>,
	Linus Torvalds <torvalds@...ux-foundation.org>,
	LKML <linux-kernel@...r.kernel.org>,
	DRI mailing list <dri-devel@...ts.freedesktop.org>
Subject: Re: [git pull] drm tree for 4.2

On 26 June 2015 at 18:05, Christian König <deathsimple@...afone.de> wrote:
> Hey Dave,
>
> I'm not 100% sure, but didn't you wanted to send this pull request out for
> drm-next-merged instead of drm-next?
>
> Cause I'm still getting merge conflicts when I try to merge 4.1 into
> drm-next.

No generally Linus likes to do his own merges with hints from us.

unless it's really tricky.

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/