Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752053AbbETGJB (ORCPT ); Wed, 20 May 2015 02:09:01 -0400 Received: from gir.skynet.ie ([193.1.99.77]:59459 "EHLO gir.skynet.ie" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751532AbbETGI7 (ORCPT ); Wed, 20 May 2015 02:08:59 -0400 Date: Wed, 20 May 2015 07:08:51 +0100 (IST) From: Dave Airlie X-X-Sender: airlied@skynet.skynet.ie To: Oded Gabbay cc: Stephen Rothwell , linux-next@vger.kernel.org, "Linux-Kernel@Vger. Kernel. Org" , Alex Deucher Subject: Re: linux-next: build failure after merge of the drm tree In-Reply-To: Message-ID: References: <20150520130828.4fdacf54@canb.auug.org.au> <20150520152538.15e7a1cc@canb.auug.org.au> <20150520153102.3e70a45c@canb.auug.org.au> User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1016 Lines: 30 > >> > drm-next and fix it up there. > >> > >> Yep, against commit 79b066bd76d5 ("drm/amdkfd: Initialize sdma vm when > >> creating sdma queue") which is in v4.1-rc3. > > > > So you could, of course, just merge that commit instead of Linus' > > tree ... > > > > -- > > Cheers, > > Stephen Rothwell sfr@canb.auug.org.au > > Hi, > Did I need to do something different in order to prevent this conflict ? > Do some manual merge before sending the pull request ? > Well this sort of thing is why linux-next exists, you can pull Linus's tree into yours to see if it builds before pulling, but you can find yourself fixing conflicts in other parts of the drm stack then. I'll pull v4.1-rc4 tag in as a nicer merge point that misc Linus master. 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/