[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Xen-devel] Powerdown problem on XEN | ACPI S5



Hi guys,
thanks for your further input.

Following through Ben's mail below and Konrad's later mail suggesting the same, I tried to get these patches in. I'd however require your help before I feel I can safely proceed.

Please see below:

Am 15.08.13 03:58, schrieb Ben Guthro:
[...]
I admit, I don't know how the gentoo build system works, but the general
idea here is that you want to revert those 2 commits, and apply the third.

If you don't have a git tree, you can download the two commits from
these two links
http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=c79c49826270b8b0061b2fca840fc3f013c8a78a
http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=8eaffa67b43e99ae581622c5133e20b0f48bcef1

You'll want to apply them in reverse
After consultation with the manual I decided to give it a dry-run before and check with you guys first. First of all, I assume I'm righht that this is a patch to the *linux kernel* and not the xen-sources as I could not find the referenced files in the xen tree.

patch -p1 -R < c79c498.patch
vm-host # patch --dry-run -p1 -R < c79c498.patch
patching file arch/x86/xen/enlighten.c
Hunk #2 succeeded at 1431 (offset 14 lines).

I am slightly worried about the last message, not so much about the offset, but rather only the "Hunk #2" success. Why is there no "Hunk #1" when there's a "Hunk #2"?

patch -p1 -R < 8eaffa67.patch
vm-host # patch --dry-run -p1 -R < 8eaffa67.patch
patching file arch/x86/xen/enlighten.c
Hunk #1 succeeded at 1367 (offset 226 lines).
patching file arch/x86/xen/mmu.c
Hunk #1 succeeded at 434 (offset 19 lines).
Hunk #2 succeeded at 482 (offset 19 lines).
Hunk #3 succeeded at 495 (offset 19 lines).

That seems to be o.k. from my understanding?

Then apply the patch from
https://lkml.org/lkml/2012/2/10/229
For this patch I copied the complete text from the https address above and copied it to a file named 229.patch. Then I issued the following command:
vm-host # patch --dry-run -p1 -R < 229.patch
patching file arch/x86/include/asm/pgtable.h
Unreversed patch detected!  Ignore -R? [n]

I am not sure what to make out of this? Could you please provide some input.

Thanks and sorry for those probably dumb questions. I'm new to this (automated) patching thing, and with a little help, the first time usually works out well.

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.