[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20111128135204.33bb929d7495d7830d09dfc3@canb.auug.org.au>
Date: Mon, 28 Nov 2011 13:52:04 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Alan Cox <alan@...rguk.ukuu.org.uk>
Cc: Dave Airlie <airlied@...ux.ie>, linux-next@...r.kernel.org,
linux-kernel@...r.kernel.org,
Jesse Barnes <jbarnes@...tuousgeek.org>,
Ville Syrjälä <ville.syrjala@...ux.intel.com>,
Rob Clark <rob.clark@...aro.org>, Greg KH <greg@...ah.com>
Subject: Re: linux-next: build failure after merge of the drm tree
Hi Alan,
On Fri, 25 Nov 2011 10:30:11 +0000 Alan Cox <alan@...rguk.ukuu.org.uk> 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.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists