From: Junio C Hamano <junkio@cox.net>
To: Dave Jones <davej@redhat.com>
Cc: git@vger.kernel.org
Subject: Re: apply-mbox claiming corrupt patch.
Date: Tue, 26 Sep 2006 22:02:08 -0700 [thread overview]
Message-ID: <7vu02tj41b.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <20060927024628.GA29182@redhat.com> (Dave Jones's message of "Tue, 26 Sep 2006 22:46:29 -0400")
Dave Jones <davej@redhat.com> writes:
> I tried to apply the mail below to my cpufreq.git tree on master.kernel.org,
> and got ..
>
> $ git-applymbox -k mbox
> 1 patch(es) to process.
>
> Applying '[CPUFREQ] Longhaul - Disable arbiter CLE266'
>
> fatal: corrupt patch at line 99
Like 99 (counting from where mailinfo splits proposed commit log
message and the patch body which is '---' line) is the line
after the closing brace "}" at the end of longhaul_cpu_init()
function.
> @@ -716,7 +739,7 @@ static int __init longhaul_cpu_init(stru
> return 0;
>
> err_acpi:
> - printk(KERN_ERR PFX "No ACPI support for CPU frequency changes.\n");
> + printk(KERN_ERR PFX "No ACPI support. No VT8601 or VT8623 northbridge. Aborting.\n");
> return -ENODEV;
> }
>
>
> ----------------------------------------------------------------------
> Jestes kierowca? To poczytaj! >>> http://link.interia.pl/f199e
The hunk claims to have 7 preimage lines and 7 postimage lines,
so that empty line after the closing brace _is_ part of the
hunk. And an empty context line is SP followed by LF. But the
SP that should be at the beginning of that line does not exist.
In short, you have a corrupt patch.
prev parent reply other threads:[~2006-09-27 5:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-27 2:46 apply-mbox claiming corrupt patch Dave Jones
2006-09-27 3:01 ` Len Brown
2006-09-27 3:14 ` Dave Jones
2006-09-27 5:02 ` Junio C Hamano [this message]
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=7vu02tj41b.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=davej@redhat.com \
--cc=git@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).