public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Andrew Morton <akpm@linux-foundation.org>
To: Valdis.Kletnieks@vt.edu
Cc: linux-kernel@vger.kernel.org
Subject: Re: mmotm 2009-06-30-12-50 uploaded
Date: Tue, 30 Jun 2009 13:38:16 -0700	[thread overview]
Message-ID: <20090630133816.f62b0cb4.akpm@linux-foundation.org> (raw)
In-Reply-To: <56465.1246393621@turing-police.cc.vt.edu>

On Tue, 30 Jun 2009 16:27:01 -0400
Valdis.Kletnieks@vt.edu wrote:

> Not sure why that line did it.  Repeated truncate-and-try shows that if the
> line contained just the 4 chars '0804', it applied fine, but '0804a' dies.

That's patch(1) thinking it's a regular diff:

akpm:/usr/src/25> diff Makefile Makefile~linux-next
4c4
< EXTRAVERSION = -rc1-mm1
---
> EXTRAVERSION = -rc1
142a143,144
> TOPDIR                := $(srctree)
> # FIXME - TOPDIR is obsolete, use srctree/objtree
149c151
< export srctree objtree VPATH
---
> export srctree objtree VPATH TOPDIR
328c330
< LDFLAGS_MODULE  = -T $(srctree)/scripts/module-common.lds
---
> LDFLAGS_MODULE  =
345,346c347
<                  -Werror-implicit-function-declaration \
<                  -Wno-format-security
---
>                  -Werror-implicit-function-declaration


So the "0804a" means "at line 804, start appending stuff", or something
like that.

Use -u.

  reply	other threads:[~2009-06-30 20:38 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-30 19:51 mmotm 2009-06-30-12-50 uploaded akpm
2009-06-30 20:15 ` Valdis.Kletnieks
2009-06-30 20:19   ` Randy Dunlap
2009-06-30 20:35     ` Andrew Morton
2009-06-30 20:39       ` Randy Dunlap
2009-06-30 20:27   ` Valdis.Kletnieks
2009-06-30 20:38     ` Andrew Morton [this message]
2009-07-01  9:21       ` KOSAKI Motohiro
2009-07-02 13:51       ` Valdis.Kletnieks
2009-06-30 21:49 ` [PATCH mmotm] hwmon: fix lis3-spi for CONFIG_PM=n Randy Dunlap
2009-07-02 19:16 ` mmotm 2009-06-30-12-50 uploaded Valdis.Kletnieks
2009-07-02 19:47   ` Andrew Morton
2009-07-02 20:21     ` Valdis.Kletnieks
2009-07-03 10:25     ` Valdis.Kletnieks
2009-07-03  1:52 ` mmotm 2009-06-30-12-50 dies during early boot Valdis.Kletnieks
2009-07-03  2:20   ` Andrew Morton
2009-07-03  8:20     ` Oleg Nesterov
2009-07-03  9:23       ` [PATCH] selinux_bprm_committed_creds: use __wake_up_parent() Oleg Nesterov
2009-07-03  9:39         ` James Morris
2009-07-03 10:12         ` Valdis.Kletnieks
2009-07-03 10:46           ` Oleg Nesterov
2009-07-03 10:16         ` David Howells
2009-07-03 16:11         ` Andrew Morton
2009-07-04  8:14           ` Oleg Nesterov

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=20090630133816.f62b0cb4.akpm@linux-foundation.org \
    --to=akpm@linux-foundation.org \
    --cc=Valdis.Kletnieks@vt.edu \
    --cc=linux-kernel@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