<p dir="ltr">I think you want to have first-patch checked out and rebase origin/staging-testing ? You mite also consider checking out staging-testing first and run git fetch origin.</p>
<p dir="ltr">On Feb 14, 2016 8:17 PM, "YU Bo" <<a href="mailto:yuzibode@126.com">yuzibode@126.com</a>> wrote:<br>
><br>
> Hi,<br>
> Some days ago i followed the tips:<br>
> <a href="http://kernelnewbies.org/FirstKernelPatch">http://kernelnewbies.org/FirstKernelPatch</a><br>
> git clone greg's git tree and built branch first-patch.<br>
> Due to my first patch that fixes coding style reported<br>
> by <a href="http://checkptch.pl">checkptch.pl</a> didn't applied,so i intend to rebase my <br>
> git branch first-patch.The question i encounter is:<br>
> ==================git command && output========<br>
> yubo@debian:~/maintree/staging$ git rebase first-patch<br>
> It looks like git-am is in progress. Cannot rebase.<br>
> yubo@debian:~/maintree/staging$ git am --abort <br>
> You seem to have moved HEAD since the last 'am' failure.<br>
> Not rewinding to ORIG_HEAD<br>
> yubo@debian:~/maintree/staging$ git rebase first-patch<br>
> First, rewinding head to replay your work on top of it...<br>
> Applying: ovl: default permissions<br>
> Using index info to reconstruct a base tree...<br>
> Falling back to patching base and 3-way merge...<br>
> ----<br>
> Auto-merging drivers/gpu/drm/i915/intel_display.c<br>
> CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c<br>
> Failed to merge in the changes.<br>
> Patch failed at 0010 drm/i915: Only run commit when crtc is active, v2.<br>
><br>
> Is there something with wrong?<br>
> Thanks in advance for the noisy.<br>
> --<br>
> Best Regards<br>
><br>
> _______________________________________________<br>
> Kernelnewbies mailing list<br>
> <a href="mailto:Kernelnewbies@kernelnewbies.org">Kernelnewbies@kernelnewbies.org</a><br>
> <a href="http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies">http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies</a><br>
><br>
</p>