From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932385AbdGXSdo (ORCPT ); Mon, 24 Jul 2017 14:33:44 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:41727 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752669AbdGXSdh (ORCPT ); Mon, 24 Jul 2017 14:33:37 -0400 X-ME-Sender: X-Sasl-enc: GYHYM+DnRIgbvyEN13ii0Cqiymp0lLS0/ns0znejakk3 1500921214 Date: Mon, 24 Jul 2017 11:33:28 -0700 From: Greg KH To: Daniel Vetter Cc: Stephen Rothwell , Dave Airlie , Intel Graphics , DRI , Linux-Next Mailing List , Linux Kernel Mailing List , Hans de Goede Subject: Re: linux-next: build failure after merge of the drm-misc tree Message-ID: <20170724183328.GA7564@kroah.com> References: <20170719114657.245537cd@canb.auug.org.au> <20170721100833.48c8fa9d@canb.auug.org.au> <20170724100341.7c4c5e33@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.8.3 (2017-05-23) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jul 24, 2017 at 10:24:41AM +0200, Daniel Vetter wrote: > On Mon, Jul 24, 2017 at 2:03 AM, Stephen Rothwell wrote: > > Hi Daniel, > > > > On Fri, 21 Jul 2017 09:24:49 +0200 Daniel Vetter wrote: > >> > >> How are we going to handle this now? The refactor is deeply burried in > >> drm-misc, I guess you could cherry-pick the relevant patches over. But > >> that'll probably lead to more conflicts because git will get confused. > > > > I'll just keep applying the merge resolution patch and will remind Dave > > and Greg about it during the week before the merge window opens so that > > they can let Linus know that the fix up is needed. > > Well, Greg squeezed the vbox driver into -rc2, so now we already get > to resolve this in a backmerge. And hopefully the bikeshed patches in > -staging won't interfere too badly with whatever refactoring we'll do > in drm-next. > > Greg, fyi this is the last time I'll ack a drm driver for staging. > This just doesn't work. We're spending more time here working the > -staging vs. drm-next conflicts than the actual vbox driver review has > taken me. And probly less than the cleanup for merging directly to > drm-next will end up taking. Hey, I was amazed that you all acked it, and it's why I required that you do so before I took it :) Good luck with the merges! greg k-h