Hello,

quoted

Hi,
Some days ago i followed the tips:
http://kernelnewbies.org/FirstKernelPatch
git clone greg's git tree and built branch first-patch.
Due to my first patch that fixes coding style reported
by checkptch.pl didn't applied,so i intend to rebase my
git branch first-patch.The question i encounter is:
==================git command && output========
yubo at debian:~/maintree/staging$  git rebase first-patch
It looks like git-am is in progress. Cannot rebase.
yubo at debian:~/maintree/staging$ git am --abort
You seem to have moved HEAD since the last 'am' failure.
Not rewinding to ORIG_HEAD
yubo at debian:~/maintree/staging$ git rebase first-patch
First, rewinding head to replay your work on top of it...
Applying: ovl: default permissions
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
----
Auto-merging drivers/gpu/drm/i915/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
Failed to merge in the changes.
Patch failed at 0010 drm/i915: Only run commit when crtc is active, v2.

Is there  something with wrong?
Thanks in advance for the noisy.

If you would like to update your patch with newest version of the tree,
I recommend to you, use git am. Here is the blog post:
http://www.pizzhacks.com/bugdrome/2011/10/deal-with-git-am-failures/

After updating your current tree;

Firstly, you should give the command:
1- git am your_old_patch

After seeing, it could not be applied, give this:
2- git apply PATCH --reject

You'll see rejected and applied chunks, the rejected parts will be specified
with extension .rej (with related file name). You should edit related
files manually.

3- git add fixed_files
4- git am --resolved


All done :). This way seems easier to me. The blog post explained
steps, quite clear as well.

Kind regards,
Ebru

-- 
Ebru Akagunduz
http://www.ebruakagunduz.com