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@debian:~/maintree/staging$ git rebase first-patch It looks like git-am is in progress. Cannot rebase. yubo@debian:~/maintree/staging$ git am --abort You seem to have moved HEAD since the last 'am' failure. Not rewinding to ORIG_HEAD yubo@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. -- Best Regards
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. On Feb 14, 2016 8:17 PM, "YU Bo" <yuzibode@126.com> wrote:
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@debian:~/maintree/staging$ git rebase first-patch It looks like git-am is in progress. Cannot rebase. yubo@debian:~/maintree/staging$ git am --abort You seem to have moved HEAD since the last 'am' failure. Not rewinding to ORIG_HEAD yubo@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. -- Best Regards
_______________________________________________ Kernelnewbies mailing list Kernelnewbies@kernelnewbies.org http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies
Hi, I just have checkouted origin/staging-testing and git rebase first-patch.Now, =============git command && output============== yubo@debian:~/maintree/staging$ git branch -a * (no branch) first-patch staging-next staging-testing remotes/origin/HEAD -> origin/master remotes/origin/master remotes/origin/staging-linus remotes/origin/staging-next remotes/origin/staging-testing remotes/origin/test ubo@debian:~/maintree/staging$ git fetch origin remote: Counting objects: 273, done. remote: Compressing objects: 100% (273/273), done. remote: Total 273 (delta 160), reused 0 (delta 0) Receiving objects: 100% (273/273), 298.64 KiB | 196 KiB/s, done. Resolving deltas: 100% (160/160), done. From git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 2cdb82c..d9750a2 staging-next -> origin/staging-next yubo@debian:~/maintree/staging$ git checkout staging-testing drivers/gpu/drm/i915/intel_display.c: needs merge error: you need to resolve your current index first ===============end================== -- Best Regards 在 2016-02-15 07:51:40，"Roger H Newell" <newell.roger@gmail.com> 写道： 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. On Feb 14, 2016 8:17 PM, "YU Bo" <yuzibode@126.com> wrote:
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@debian:~/maintree/staging$ git rebase first-patch It looks like git-am is in progress. Cannot rebase. yubo@debian:~/maintree/staging$ git am --abort You seem to have moved HEAD since the last 'am' failure. Not rewinding to ORIG_HEAD yubo@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. -- Best Regards
_______________________________________________ Kernelnewbies mailing list Kernelnewbies@kernelnewbies.org http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies
Sorry for hasty to send previous email. Maybe i have to delete the branch first-patch.But i still will figure out the problem in git way. Thank you, -- Best Regards 在 2016-02-15 08:10:35，"YU Bo" <yuzibode@126.com> 写道： Hi, I just have checkouted origin/staging-testing and git rebase first-patch.Now, =============git command && output============== yubo@debian:~/maintree/staging$ git branch -a * (no branch) first-patch staging-next staging-testing remotes/origin/HEAD -> origin/master remotes/origin/master remotes/origin/staging-linus remotes/origin/staging-next remotes/origin/staging-testing remotes/origin/test ubo@debian:~/maintree/staging$ git fetch origin remote: Counting objects: 273, done. remote: Compressing objects: 100% (273/273), done. remote: Total 273 (delta 160), reused 0 (delta 0) Receiving objects: 100% (273/273), 298.64 KiB | 196 KiB/s, done. Resolving deltas: 100% (160/160), done. From git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 2cdb82c..d9750a2 staging-next -> origin/staging-next yubo@debian:~/maintree/staging$ git checkout staging-testing drivers/gpu/drm/i915/intel_display.c: needs merge error: you need to resolve your current index first ===============end================== -- Best Regards 在 2016-02-15 07:51:40，"Roger H Newell" <newell.roger@gmail.com> 写道： 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. On Feb 14, 2016 8:17 PM, "YU Bo" <yuzibode@126.com> wrote:
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@debian:~/maintree/staging$ git rebase first-patch It looks like git-am is in progress. Cannot rebase. yubo@debian:~/maintree/staging$ git am --abort You seem to have moved HEAD since the last 'am' failure. Not rewinding to ORIG_HEAD yubo@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. -- Best Regards
_______________________________________________ Kernelnewbies mailing list Kernelnewbies@kernelnewbies.org http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies
Hello,
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@debian:~/maintree/staging$ git rebase first-patch It looks like git-am is in progress. Cannot rebase. yubo@debian:~/maintree/staging$ git am --abort You seem to have moved HEAD since the last 'am' failure. Not rewinding to ORIG_HEAD yubo@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
Hello, At 2016-02-15 16:57:46, "Ebru Akagündüz" <ebru.akagunduz@gmail.com> wrote:
Hello,
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@debian:~/maintree/staging$ git rebase first-patch It looks like git-am is in progress. Cannot rebase. yubo@debian:~/maintree/staging$ git am --abort You seem to have moved HEAD since the last 'am' failure. Not rewinding to ORIG_HEAD yubo@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.
Thanks. I will learn more about git.
Kind regards, Ebru
-- Ebru Akagunduz http://www.ebruakagunduz.com
_______________________________________________ Kernelnewbies mailing list Kernelnewbies@kernelnewbies.org http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies
participants (3)
-
Ebru Akagündüz -
Roger H Newell -
YU Bo