project kernel/samsung/klte/
First, rewinding head to replay your work on top of it...
Applying: nfc: export header for userspace
Applying: net: core: Support UID-based routing.
Applying: msm: vidc: Add support for setting initial qp
Using index info to reconstruct a base tree...
M	drivers/media/platform/msm/vidc/hfi_packetization.c
M	drivers/media/platform/msm/vidc/msm_venc.c
M	drivers/media/platform/msm/vidc/vidc_hfi_api.h
M	drivers/media/platform/msm/vidc/vidc_hfi_helper.h
M	include/linux/videodev2.h
Falling back to patching base and 3-way merge...
Auto-merging include/linux/videodev2.h
CONFLICT (content): Merge conflict in include/linux/videodev2.h
Recorded preimage for 'include/linux/videodev2.h'
Failed to merge in the changes.
Patch failed at 0003 msm: vidc: Add support for setting initial qp
The copy of the patch that failed is found in:
   /home/garth/cm12/kernel/samsung/klte/.git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.