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@xxxxxxxxxx> > > 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@xxxxxxxxxx> > --- > 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)]$ -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
