From: Zachary Amsden <zach@vmware.com>
To: Virtualization Mailing List <virtualization@lists.osdl.org>,
Rusty Russell <rusty@rustcorp.com.au>,
Chris Wright <chrisw@sous-sol.org>,
Jeremy Fitzhardinge <jeremy@goop.org>, Andi Kleen <ak@suse.de>,
Andrew Morton <akpm@osdl.org>
Subject: Paravirt-ops next steps
Date: Thu, 09 Nov 2006 19:27:30 -0800 [thread overview]
Message-ID: <4553F1A2.2050802@vmware.com> (raw)
So it's gotten a bit confusing to figure out how we should go about
upstreaming the rest of our patches. Our patchkit in the paravirt-ops
tree currently applies to 2.6.19-rc4-mm2, but there are a number of
conflicts that got resolved when merging into Andi's i386 tree.
What is the best way to sanitize the remaining patches so they smoothly
integrate into the appropriate trees? Should we rebase to Andi's tree,
resync to -rc5-mm1, or just cross our fingers and fix up rejects as they
occur?
Right now I'm working on getting the timer code for VMI fixed up, and it
requires several hooks in the timer infrastructure and possibly the APIC
infrastructure that has been changed a lot recently by Thomas Gleixner's
patches - I don't see any obvious conflicts, and the new code looks
better, but it would be comforting to know I am baking changes against
the right tree.
Zach
next reply other threads:[~2006-11-10 3:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-11-10 3:27 Zachary Amsden [this message]
2006-11-10 3:37 ` Paravirt-ops next steps Andrew Morton
2006-11-10 3:48 ` Zachary Amsden
2006-11-10 3:58 ` Andrew Morton
2006-11-10 4:16 ` Zachary Amsden
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=4553F1A2.2050802@vmware.com \
--to=zach@vmware.com \
--cc=ak@suse.de \
--cc=akpm@osdl.org \
--cc=chrisw@sous-sol.org \
--cc=jeremy@goop.org \
--cc=rusty@rustcorp.com.au \
--cc=virtualization@lists.osdl.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).