All of lore.kernel.org
 help / color / mirror / Atom feed
From: Randy Dunlap <randy.dunlap@oracle.com>
To: Peter W Morreale <pmorreale@novell.com>
Cc: linux-kernel@vger.kernel.org, riel@nl.linux.org,
	linux-mm@kvack.org, akpm@linux-foundation.org
Subject: Re: [PATCH v3] Update of Documentation/
Date: Fri, 02 Jan 2009 11:40:18 -0800	[thread overview]
Message-ID: <495E6DA2.8060901@oracle.com> (raw)
In-Reply-To: <20090102193116.8124.22532.stgit@hermosa.site>

Peter W Morreale wrote:
> This patch updates Documentation/sysctl/vm.txt and
> Documentation/filesystems/proc.txt.   More specifically, the section on
> /proc/sys/vm in Documentation/filesystems/proc.txt was removed and a
> link to Documentation/sysctl/vm.txt added.
> 
> Most of the verbiage from proc.txt was simply moved in vm.txt, with new
> addtional text for "swappiness" and "stat_interval".
> 
> This update applies against linux-next-20090102.
> 
> Best,
> -PWM
> ---
> 
> Signed-off-by: Peter W Morreale <pmorreale@novell.com>
> 
>  Documentation/filesystems/proc.txt |  266 ----------------
>  Documentation/sysctl/vm.txt        |  590 +++++++++++++++++++++++++-----------
>  2 files changed, 413 insertions(+), 443 deletions(-)

I get this when trying to apply the patch (using 'patch'), but I don't
see why (yet):


|diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
|index 334ef2f..0a9c66a 100644
|--- a/Documentation/filesystems/proc.txt
|+++ b/Documentation/filesystems/proc.txt
--------------------------
Patching file Documentation/filesystems/proc.txt using Plan A...
Hunk #1 succeeded at 5.
Hunk #2 succeeded at 1373.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/Documentation/sysctl/vm.txt b/Documentation/sysctl/vm.txt
|index e9a5c28..9c97c68 100644
|--- a/Documentation/sysctl/vm.txt
|+++ b/Documentation/sysctl/vm.txt
--------------------------
Patching file Documentation/sysctl/vm.txt using Plan A...
Hunk #1 succeeded at 1.
Hunk #2 FAILED at 17.
1 out of 2 hunks FAILED -- saving rejects to file Documentation/sysctl/vm.txt.rej
Hmm...missing header for unified diff at line 603 of patch
  The next patch looks like a unified diff to me...
can't find file to patch at input line 603
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
| 
--------------------------
File to patch:




-- 
~Randy

WARNING: multiple messages have this Message-ID (diff)
From: Randy Dunlap <randy.dunlap@oracle.com>
To: Peter W Morreale <pmorreale@novell.com>
Cc: linux-kernel@vger.kernel.org, riel@nl.linux.org,
	linux-mm@kvack.org, akpm@linux-foundation.org
Subject: Re: [PATCH v3] Update of Documentation/
Date: Fri, 02 Jan 2009 11:40:18 -0800	[thread overview]
Message-ID: <495E6DA2.8060901@oracle.com> (raw)
In-Reply-To: <20090102193116.8124.22532.stgit@hermosa.site>

Peter W Morreale wrote:
> This patch updates Documentation/sysctl/vm.txt and
> Documentation/filesystems/proc.txt.   More specifically, the section on
> /proc/sys/vm in Documentation/filesystems/proc.txt was removed and a
> link to Documentation/sysctl/vm.txt added.
> 
> Most of the verbiage from proc.txt was simply moved in vm.txt, with new
> addtional text for "swappiness" and "stat_interval".
> 
> This update applies against linux-next-20090102.
> 
> Best,
> -PWM
> ---
> 
> Signed-off-by: Peter W Morreale <pmorreale@novell.com>
> 
>  Documentation/filesystems/proc.txt |  266 ----------------
>  Documentation/sysctl/vm.txt        |  590 +++++++++++++++++++++++++-----------
>  2 files changed, 413 insertions(+), 443 deletions(-)

I get this when trying to apply the patch (using 'patch'), but I don't
see why (yet):


|diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
|index 334ef2f..0a9c66a 100644
|--- a/Documentation/filesystems/proc.txt
|+++ b/Documentation/filesystems/proc.txt
--------------------------
Patching file Documentation/filesystems/proc.txt using Plan A...
Hunk #1 succeeded at 5.
Hunk #2 succeeded at 1373.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/Documentation/sysctl/vm.txt b/Documentation/sysctl/vm.txt
|index e9a5c28..9c97c68 100644
|--- a/Documentation/sysctl/vm.txt
|+++ b/Documentation/sysctl/vm.txt
--------------------------
Patching file Documentation/sysctl/vm.txt using Plan A...
Hunk #1 succeeded at 1.
Hunk #2 FAILED at 17.
1 out of 2 hunks FAILED -- saving rejects to file Documentation/sysctl/vm.txt.rej
Hmm...missing header for unified diff at line 603 of patch
  The next patch looks like a unified diff to me...
can't find file to patch at input line 603
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
| 
--------------------------
File to patch:




-- 
~Randy

--
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/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

  reply	other threads:[~2009-01-02 19:42 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-02 19:31 [PATCH v3] Update of Documentation/ Peter W Morreale
2009-01-02 19:31 ` Peter W Morreale
2009-01-02 19:40 ` Randy Dunlap [this message]
2009-01-02 19:40   ` Randy Dunlap

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=495E6DA2.8060901@oracle.com \
    --to=randy.dunlap@oracle.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=pmorreale@novell.com \
    --cc=riel@nl.linux.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.