From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Airlie Subject: Re: linux-next: build failure after merge of the drm tree Date: Mon, 28 Nov 2011 14:05:13 +0000 Message-ID: References: <20111116113007.5656a7b4823ba085a46c57ae@canb.auug.org.au> <20111125124913.405fc8360a185f3116adb5ec@canb.auug.org.au> <20111125103011.18e167cd@lxorguk.ukuu.org.uk> <20111128135317.a99880b234c6c060a622fa31@canb.auug.org.au> <20111128113056.2099e4c3@lxorguk.ukuu.org.uk> <20111129001353.399142710ab77822b29552f0@canb.auug.org.au> <20111128131847.48bffb93@lxorguk.ukuu.org.uk> <20111129005341.c5caf7f353876a0dd4764d3c@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <20111129005341.c5caf7f353876a0dd4764d3c@canb.auug.org.au> Sender: linux-kernel-owner@vger.kernel.org To: Stephen Rothwell Cc: Alan Cox , Dave Airlie , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jesse Barnes List-Id: linux-next.vger.kernel.org On Mon, Nov 28, 2011 at 1:53 PM, Stephen Rothwell wrote: > Hi Alan, > > On Mon, 28 Nov 2011 13:18:47 +0000 Alan Cox wrote: >> >> > > Well its very hard to sort stuff out when you are juggling a cro= ss tree >> > > set of dependancies and someone pointlessly stops one of them be= ing >> > > visible in next for ten days. >> > >> > The mess in the drm tree has nothing to do with the staging tree. >> >> I would suggest you re-read the paragraph above, and the mails I sen= t you >> about marking the staging gma500 tree broken (which given nothing >> happened in response to any of them I imagine you didn't). > > When I originally reported this problem, you responded: > >> gma500 is frozen pending Dave Airlie's applying the patches moving i= t out >> of staging. >> >> > > Which I assumed was aimed at Dave. =A0Then Jesse (whose changes broke= the > code in staging) responded with a patch which I assumed that Dave wou= ld > do something with. =A0Then the next day you responded with: > >> If the staging gma500 is causing this still please resolve it by mar= king >> the GMA500 in staging "&& BROKEN" for the moment. > > And maybe I should have done something then. =A0I fall back on the ex= cuse > that I have about 200 trees to merge every day and when I use to fix > things for people I used to have lots of 12-16 hour days ... > >> And if you still think that blocking the DRM tree from -next for ten= days >> thus stopping all sorts of other integration work and forcing people= 's >> hands on moving from staging and the like didn't cause the problems = and >> is the right policy then we'll just have to agree to differ. > > If you are trying to get something merged into the drm tree, you shou= ld > be working with the drm tree and with the drm maintainer, not > linux-next. =A0Linux-next is here to find integration problems betwee= n > trees and across architectures not to find problems with changes with= in > one tree. > > And I repeat, the breakage today is nothing to do with the staging tr= ee, > it is in the drm tree and how your gma500 changes were merged there (= and > to be clear, there is nothing wrong with the gma500 changes per se). > > In the future, I will try to remember to "kill staging first", but th= is > is the first time it has come up since staging started being built by= an > allmodconfig build (which it used not to be - and that change was not= my > choice). Yeah I've tracked it down here, I had messed up the configs locally so Alan's code wasn't built, I'll pile some fixes on top of it today. Dave.