[cairo] [PATCH 22/72] drm: fixed missing includes

Enrico Weigelt, metux IT consult enrico.weigelt at gr13.net
Fri Jan 15 13:00:57 PST 2016

On 15.01.2016 21:56, Bryce Harrington wrote:

> $ 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

hmm, maybe rebase + cherry-pick are more intelligent than am.

just pushed my rebased branch onto github - feel free to pick it from there.



Enrico Weigelt,
metux IT consulting

More information about the cairo mailing list