lkml.org 
[lkml]   [2009]   [Apr]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: Linux 2.6.30-rc2


On Wed, 15 Apr 2009, Zhang, Yanmin wrote:
>
> There are lots of conflictions when I apply it to 2.6.29.
>
> Bleow are just some.
>
> patching file arch/arm/configs/xm_x2xx_defconfig
> Hunk #1 FAILED at 1.
> Hunk #2 succeeded at 62 (offset -1 lines).

Damn.

It patches just fine if you use "git apply".

The problem? I had enabled rename detection in my .gitconfig due to
testing a git patch, and forgotten all about it. So when I generated the
patch, it had rename detection on. And so part of the patch looks like

diff --git a/arch/arm/configs/xm_x2xx_defconfig b/arch/arm/configs/cm_x2xx_defconfig
similarity index 83%
copy from arch/arm/configs/xm_x2xx_defconfig
copy to arch/arm/configs/cm_x2xx_defconfig
index 1039f36..797b790 100644
--- a/arch/arm/configs/xm_x2xx_defconfig
+++ b/arch/arm/configs/cm_x2xx_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27-rc8
-# Sun Oct 5 11:05:36 2008
+# Linux kernel version: 2.6.29-rc2
+# Sun Feb 1 16:31:36 2009
#
CONFIG_ARM=y
...

and other parts just contain pure renames, and "patch" obviously won't
understand any of that.

My bad. I didn't mean to leave people without git out in the rain. I've
re-uploaded a fixed one that doesn't have those git features..

Alessandro - did you also do things by applying that patch? Maybe your
compile failure can be explained by the same thing, and just comes from
not noticing the patch apply failure.

Sorry about that. The fixed patch is on master.kernel.org and should be
mirroring out asap. And I've fixed my .gitconfig, and hopefully this won't
happen again.

Linus

\
 
 \ /
  Last update: 2009-04-15 04:07    [W:0.130 / U:6.292 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site