Hi Daniel, On Mon, 24 Sep 2012 13:31:54 +0200 Daniel Vetter <daniel@xxxxxxxx> wrote: > > Looks good. I've known about this issue and tried to improve matters by > applying the patch to both trees (to at least force a conflict), but not > even with that patch applied in my drm-intel-next queue I get a proper > conflict. I guess I need to do a proper backmerge. > > Fixup patch looks good for now. If that is all that is needed, just make sure Linus is informed of the merge conflict fix when he merged the drm tree. If there is more, it is up to you and Dave. If you do a back merge, make sure that it is properly commented. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpZnWhm81yLr.pgp
Description: PGP signature
