On Fri, Nov 25, 2011 at 10:30 AM, Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> 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 > I just pushed jbarnes patch into my tree for now, at pushed out the mainline gma500 code with it. But if someone can send a patch to Greg to mark GMA500 broken in staging that would be good. Dave. -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
