git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dave Jones <davej@redhat.com>
To: Len Brown <lenb@kernel.org>
Cc: git@vger.kernel.org
Subject: Re: apply-mbox claiming corrupt patch.
Date: Tue, 26 Sep 2006 23:14:03 -0400	[thread overview]
Message-ID: <20060927031403.GA31144@redhat.com> (raw)
In-Reply-To: <200609262301.12235.len.brown@intel.com>

On Tue, Sep 26, 2006 at 11:01:12PM -0400, Len Brown wrote:
 > I ran into a similar problem recently -- though looking
 > at the patch below I can't prove it is the exact same problem.
 > 
 > Patch appears to put a space, + or - on each line.
 > Somebody edited their patch with kate, and that automatically
 > "cleaned up" the lines with just a space on them -- leaving
 > them completely blank.
 > 
 > patch ate the result, but git-am (and git-apply) did not.
 > fixed it by refreshing with quilt.

Through some more trial and error, it turned out that chopping
off the footer of the email (the last two lines here..)

 > > @@ -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

Made it all work.
Very strange.

	Dave

  reply	other threads:[~2006-09-27  3:14 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 [this message]
2006-09-27  5:02 ` Junio C Hamano

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=20060927031403.GA31144@redhat.com \
    --to=davej@redhat.com \
    --cc=git@vger.kernel.org \
    --cc=lenb@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).