<div style="line-height:1.7;color:#000000;font-size:14px;font-family:Arial"><div>Hi,</div><div>I just have checkouted origin/staging-testing and git rebase first-patch.Now,</div><div>=============git command && output==============</div><div><div>yubo@debian:~/maintree/staging$ git branch -a</div><div>* (no branch)</div><div> first-patch</div><div> staging-next</div><div> staging-testing</div><div> remotes/origin/HEAD -> origin/master</div><div> remotes/origin/master</div><div> remotes/origin/staging-linus</div><div> remotes/origin/staging-next</div><div> remotes/origin/staging-testing</div><div> remotes/origin/test</div></div><div><div>ubo@debian:~/maintree/staging$ git fetch origin</div><div>remote: Counting objects: 273, done.</div><div>remote: Compressing objects: 100% (273/273), done.</div><div>remote: Total 273 (delta 160), reused 0 (delta 0)</div><div>Receiving objects: 100% (273/273), 298.64 KiB | 196 KiB/s, done.</div><div>Resolving deltas: 100% (160/160), done.</div><div>From git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging</div><div> 2cdb82c..d9750a2 staging-next -> origin/staging-next</div><div>yubo@debian:~/maintree/staging$ git checkout staging-testing </div><div>drivers/gpu/drm/i915/intel_display.c: needs merge</div><div>error: you need to resolve your current index first</div></div><div>===============end==================</div><div><br></div><div><br></div><br><br><br><br><div style="position:relative;zoom:1">--<br>Best Regards<br><div style="clear:both"></div></div><div id="divNeteaseMailCard"></div><br>ÔÚ 2016-02-15 07:51:40£¬"Roger H Newell" <newell.roger@gmail.com> дµÀ£º<br> <blockquote id="isReplyContent" style="PADDING-LEFT: 1ex; MARGIN: 0px 0px 0px 0.8ex; BORDER-LEFT: #ccc 1px solid"><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>
</blockquote></div>