From: Atom2 <ariel.atom2@web2web.at>
To: Ben Guthro <ben@guthro.net>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
Ian Campbell <ian.campbell@citrix.com>,
xen-devel <xen-devel@lists.xenproject.org>,
Jan Beulich <JBeulich@suse.com>
Subject: Re: Powerdown problem on XEN | ACPI S5
Date: Thu, 15 Aug 2013 21:28:24 +0200 [thread overview]
Message-ID: <520D2BD8.6050606@web2web.at> (raw)
In-Reply-To: <CAOvdn6Uwyw1UxQpOBcyg0D2UpmJfZZhrYdTw=VMbg6+wBCJekQ@mail.gmail.com>
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.
next prev parent reply other threads:[~2013-08-15 19:28 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-14 8:48 Powerdown problem on XEN | ACPI S5 Atom2
2013-08-14 10:30 ` Jan Beulich
2013-08-14 13:52 ` Atom2
2013-08-14 14:00 ` Andrew Cooper
2013-08-14 17:00 ` Atom2
2013-08-14 17:30 ` Andrew Cooper
2013-08-14 18:40 ` Atom2
2013-08-14 19:10 ` Atom2
2013-08-14 19:18 ` Andrew Cooper
2013-08-14 19:39 ` Atom2
2013-08-14 20:18 ` Andrew Cooper
2013-08-14 20:24 ` Atom2
2013-08-14 20:30 ` Atom2
2013-08-14 20:34 ` Ben Guthro
2013-08-14 20:37 ` Konrad Rzeszutek Wilk
2013-08-14 21:56 ` Atom2
2013-08-15 1:58 ` Ben Guthro
2013-08-15 19:28 ` Atom2 [this message]
2013-08-15 20:26 ` Konrad Rzeszutek Wilk
2013-08-15 21:39 ` Atom2
2013-08-16 12:24 ` Konrad Rzeszutek Wilk
2013-12-11 21:52 ` Konrad Rzeszutek Wilk
2013-08-15 13:40 ` Konrad Rzeszutek Wilk
2013-08-14 20:38 ` Andrew Cooper
2013-08-14 20:54 ` Atom2
2013-08-14 21:11 ` Andrew Cooper
2013-08-15 8:12 ` Jan Beulich
2013-08-15 8:16 ` Atom2
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=520D2BD8.6050606@web2web.at \
--to=ariel.atom2@web2web.at \
--cc=JBeulich@suse.com \
--cc=andrew.cooper3@citrix.com \
--cc=ben@guthro.net \
--cc=ian.campbell@citrix.com \
--cc=xen-devel@lists.xenproject.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;
as well as URLs for NNTP newsgroup(s).