Re: [PATCH 22/72] drm: fixed missing includes
Bryce Harrington <[email protected]>
| Newsgroups | gmane.comp.lib.cairo |
|---|---|
| Message-ID | <[email protected]> |
On Fri, Jan 15, 2016 at 09:48:48PM +0100, Enrico Weigelt, metux IT consult wrote: > On 15.01.2016 21:33, Bryce Harrington wrote: > > On Tue, Dec 29, 2015 at 10:17:00AM +0100, Enrico Weigelt, metux IT consult wrote: > >> Signed-off-by: Enrico Weigelt, metux IT consult <[email protected]> > > > > Seems straightforward enough. > > I'd push it but it appears to depend on one of the earlier patches that > > hasn't been pushed yet, so for now just marking R-b. > > It should not. Just cherry-picked it directly on master, applied fine. Agreed it shouldn't, but... $ pwclient git-am 69175 Applying patch #69175 using 'git am' Description: [22/72] drm: fixed missing includes Applying: drm: fixed missing includes error: patch failed: src/drm/cairo-drm-radeon.c:33 error: src/drm/cairo-drm-radeon.c: patch does not apply Patch failed at 0001 drm: fixed missing includes The copy of the patch that failed is found in: /home/bryce/src/Cairo/cairo/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". 'git am' failed with exit status 1 Bryce -- cairo mailing list [email protected] http://lists.cairographics.org/mailman/listinfo/cairo