From: Len Brown <lenb@kernel.org>
To: Randy Dunlap <randy.dunlap@oracle.com>
Cc: linux-acpi@vger.kernel.org, linux-pm@lists.linux-foundation.org,
dwmw2@infradead.org, cbou@mail.ru
Subject: Re: [linux-pm] [PATCH] doc/power: move power-related files to Documentation/power/
Date: Wed, 12 Mar 2008 17:49:37 -0400 [thread overview]
Message-ID: <200803121749.37889.lenb@kernel.org> (raw)
In-Reply-To: <20080312144110.113c853b.randy.dunlap@oracle.com>
On Wednesday 12 March 2008, Randy Dunlap wrote:
> On Wed, 12 Mar 2008 16:00:45 -0400 Len Brown wrote:
>
> > linus top of tree. i was wrong that it was already gone,
> > i guess i assumed that since it had 1 hunk and patch
> > told me the hunk was reversed i assumed that part
> > had been applied already.
>
> Can you try the patch below?
> It works_for_me but that doesn't give me lots of confidence.
>
> ---
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> Move power-related files to Documentation/power/.
>
> Move 00-INDEX entries to power/00-INDEX (and add entry for
> pm_qos_interface.txt).
>
> Update references to moved filenames.
>
> Fix some trailing whitespace.
>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> ---
> Documentation/00-INDEX | 4
> Documentation/kernel-parameters.txt | 2
> Documentation/pm.txt | 257 -------------------
> Documentation/pm_qos_interface.txt | 59 ----
> Documentation/power/00-INDEX | 6
> Documentation/power/pm.txt | 257 +++++++++++++++++++
> Documentation/power/pm_qos_interface.txt | 59 ++++
> Documentation/power/power_supply_class.txt | 169 ++++++++++++
> Documentation/power_supply_class.txt | 169 ------------
> arch/x86/Kconfig | 2
> kernel/power/Kconfig | 2
> 11 files changed, 494 insertions(+), 492 deletions(-)
>
not better
Please send it to me as an attachment,
maybe kmail is getting confused b/c this text has non ascii characters?
(does this patch apply for anybody else?)
thanks,
-Len
[lenb@t61 linus (master)]$ patch -Np1 --dry-run < ~/Documents/doc-new.patch
patching file Documentation/00-INDEX
patching file Documentation/power/00-INDEX
patching file Documentation/pm.txt
patching file Documentation/power/pm.txt
patching file Documentation/pm_qos_interface.txt
patching file Documentation/power/pm_qos_interface.txt
patching file Documentation/power/power_supply_class.txt
patching file Documentation/power_supply_class.txt
Reversed (or previously applied) patch detected! Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file Documentation/power_supply_class.txt.rej
patching file arch/x86/Kconfig
patching file kernel/power/Kconfig
patching file Documentation/kernel-parameters.txt
[lenb@t61 linus (master)]$
next prev parent reply other threads:[~2008-03-12 21:51 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-04 21:48 [PATCH] doc/power: move power-related files to Documentation/power/ Randy Dunlap
2008-03-04 22:08 ` Rafael J. Wysocki
2008-03-04 22:08 ` Rafael J. Wysocki
2008-03-12 6:47 ` Len Brown
2008-03-12 6:47 ` Len Brown
2008-03-12 16:33 ` Randy Dunlap
2008-03-12 20:00 ` Len Brown
2008-03-12 21:41 ` Randy Dunlap
2008-03-12 21:41 ` [linux-pm] " Randy Dunlap
2008-03-12 21:49 ` Len Brown
2008-03-12 21:49 ` Len Brown [this message]
2008-03-12 21:54 ` Randy Dunlap
2008-03-12 21:54 ` [linux-pm] " Randy Dunlap
2008-03-12 22:08 ` Len Brown
2008-03-12 22:08 ` Len Brown
2008-03-12 20:00 ` Len Brown
2008-03-12 16:33 ` 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=200803121749.37889.lenb@kernel.org \
--to=lenb@kernel.org \
--cc=cbou@mail.ru \
--cc=dwmw2@infradead.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-pm@lists.linux-foundation.org \
--cc=randy.dunlap@oracle.com \
/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.