From: Michal Hocko <mhocko@suse.cz>
To: akpm@linux-foundation.org
Cc: mm-commits@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-mm@kvack.org, linux-fsdevel@vger.kernel.org,
linux-next@vger.kernel.org
Subject: Re: mmotm 2011-08-24-14-08 uploaded
Date: Thu, 25 Aug 2011 16:07:01 +0200 [thread overview]
Message-ID: <20110825140701.GA6838@tiehlicka.suse.cz> (raw)
In-Reply-To: <20110825135103.GA6431@tiehlicka.suse.cz>
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, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2011-08-25 14:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-24 21:09 mmotm 2011-08-24-14-08 uploaded akpm
2011-08-24 22:04 ` Randy Dunlap
2011-08-24 22:08 ` Randy Dunlap
2011-08-24 22:11 ` Andrew Morton
2011-08-25 7:13 ` KAMEZAWA Hiroyuki
2011-08-25 15:18 ` Randy Dunlap
2011-08-25 13:51 ` Michal Hocko
2011-08-25 14:07 ` Michal Hocko [this message]
2011-08-25 15:09 ` Stephen Rothwell
2011-08-25 15:45 ` Johannes Weiner
2011-08-25 17:12 ` Randy Dunlap
2011-08-26 7:21 ` Michal Hocko
2011-08-25 19:23 ` Andrew Morton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110825140701.GA6838@tiehlicka.suse.cz \
--to=mhocko@suse.cz \
--cc=akpm@linux-foundation.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-next@vger.kernel.org \
--cc=mm-commits@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).