On Thu 25-08-11 15:51:03, Michal Hocko wrote: > Hi Andrew, > > On Wed 24-08-11 14:09:05, Andrew Morton wrote: > > The mm-of-the-moment snapshot 2011-08-24-14-08 has been uploaded to > > > > http://userweb.kernel.org/~akpm/mmotm/ > > I have just downloaded your tree and cannot quilt it up. I am getting: > [...] > patching file tools/power/cpupower/debug/x86_64/centrino-decode.c > Hunk #1 FAILED at 1. > File tools/power/cpupower/debug/x86_64/centrino-decode.c is not empty after patch, as expected > 1 out of 1 hunk FAILED -- rejects in file tools/power/cpupower/debug/x86_64/centrino-decode.c > patching file tools/power/cpupower/debug/x86_64/powernow-k8-decode.c > Hunk #1 FAILED at 1. > File tools/power/cpupower/debug/x86_64/powernow-k8-decode.c is not empty after patch, as expected > 1 out of 1 hunk FAILED -- rejects in file tools/power/cpupower/debug/x86_64/powernow-k8-decode.c > [...] > patching file virt/kvm/iommu.c > Patch linux-next.patch does not apply (enforce with -f) > > Is this a patch (I am using 2.6.1) issue? The failing hunk looks as > follows: > --- a/tools/power/cpupower/debug/x86_64/centrino-decode.c > +++ /dev/null > @@ -1 +0,0 @@ > -../i386/centrino-decode.c > \ No newline at end of file Isn't this just a special form of git (clever) diff to spare some lines when the file deleted? Or is the patch simply corrupted? Anyway, my patch doesn't cope with that. Any hint what to do about it? Thanks -- Michal Hocko SUSE Labs SUSE LINUX s.r.o. Lihovarska 1060/12 190 00 Praha 9 Czech Republic -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
