Messages in this thread | | | Date | Wed, 15 Apr 2009 15:26:43 +0200 | Subject | Re: Linux 2.6.30-rc2 | From | Alessandro Suardi <> |
| |
On Wed, Apr 15, 2009 at 4:01 AM, Linus Torvalds <torvalds@linux-foundation.org> wrote: > > > 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.
Must have been that for sure... I re-downloaded the patch and successfully rebuilt 2.6.30-rc2, thanks !
> 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
--alessandro
"Sun keeps rising in the west / I keep on waking fully confused"
(The Replacements, "Within Your Reach") -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |