From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg KH Subject: Re: linux-next: build failure after merge of the drm tree Date: Mon, 28 Nov 2011 14:07:49 +0900 Message-ID: <20111128050749.GC9372@kroah.com> References: <20111116113007.5656a7b4823ba085a46c57ae@canb.auug.org.au> <20111125124913.405fc8360a185f3116adb5ec@canb.auug.org.au> <20111125103011.18e167cd@lxorguk.ukuu.org.uk> <20111128135204.33bb929d7495d7830d09dfc3@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20111128135204.33bb929d7495d7830d09dfc3@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 , Ville =?iso-8859-1?Q?Syrj=E4l=E4?= , Rob Clark List-Id: linux-next.vger.kernel.org On Mon, Nov 28, 2011 at 01:52:04PM +1100, Stephen Rothwell wrote: > Hi Alan, > > On Fri, 25 Nov 2011 10:30:11 +0000 Alan Cox wrote: > > > > > Ping? > > > > As I said last time you asked this - the correct merge resolution is to > > pull the DRM updates and mark the staging GMA500 Kconfig "&& BROKEN". The > > staging driver is frozen while we merge outside of staging and will not > > be getting any attention at this point - changes there just mess up the > > move work which is far more important. > > > > Also nothing in staging should be allowed to hold up real work. The > > resolution for anything in staging blocking merges is to mark the staging > > parts && BROKEN IMHO > > Then if you are moving a driver out of staging, you should put a patch in > your tree to disable it in staging (or remove it in staging) and send > that patch to Greg as well. That patch is already in my staging-next tree, so all should be good now. Even then, I don't think that broken staging drivers should stop any other tree from being included, except for the staging tree itself. thanks, greg k-h