Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752549AbbFZUiG (ORCPT ); Fri, 26 Jun 2015 16:38:06 -0400 Received: from mail-lb0-f178.google.com ([209.85.217.178]:34543 "EHLO mail-lb0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751828AbbFZUh5 convert rfc822-to-8bit (ORCPT ); Fri, 26 Jun 2015 16:37:57 -0400 MIME-Version: 1.0 In-Reply-To: <558D07C4.1070908@vodafone.de> References: <558D07C4.1070908@vodafone.de> Date: Sat, 27 Jun 2015 06:37:55 +1000 Message-ID: Subject: Re: [git pull] drm tree for 4.2 From: Dave Airlie To: =?UTF-8?Q?Christian_K=C3=B6nig?= Cc: Dave Airlie , Linus Torvalds , LKML , DRI mailing list Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 638 Lines: 19 On 26 June 2015 at 18:05, Christian König 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/