Hi, Jeremy, when I check the latest dom0 tree, seems the latest changeset is
still in March 29 as shown below. As I''m new to git, so I want to
confirm I didn''t make anything wrong, and there is no changes after
that?
And also, all pv_dom0 work should base on xen/dom0/hackery branch, am I right?
Thanks
Yunhong Jiang
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date: Sun Mar 29 15:54:17 2009 -0700
Merge branch ''xen/core'' into xen/dom0/hackery
* xen/core:
xen: mask events on interrupt gates properly
xen: set _PAGE_NX in __supported_pte_mask before pagetable construction
Conflicts:
arch/x86/xen/enlighten.c
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
On Mon, 20 Apr 2009, Jiang, Yunhong wrote:> Hi, Jeremy, when I check the latest dom0 tree, seems the latest > changeset is still in March 29 as shown below. As I''m new to git, so I > want to confirm I didn''t make anything wrong, and there is no changes > after that? And also, all pv_dom0 work should base on xen/dom0/hackery > branch, am I right?xen/dom0/hackery was left behind a bit during the attempt to get dom0 into 2.6.30 during the merge window. Alternate branches to use are push2/xen/dom0/master and xen-tip/next . I believe the plan is that xen-tip/next will become the branch to use, but not all the patches from the other branches have been copied across yet. Michael Young _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Thanks for your information. Seems xen-tip/next is changed in April 14 while push2/xen/dom0/master is still in Mar 29. Can I assume all patch is hackery or push2/xen/dom0/master is in xen-tip/next already? If yes, I will base my patch on xen-tip/next. Thanks. Jiang Yunhong xen-devel-bounces@lists.xensource.com wrote:> On Mon, 20 Apr 2009, Jiang, Yunhong wrote: > >> Hi, Jeremy, when I check the latest dom0 tree, seems the latest >> changeset is still in March 29 as shown below. As I''m new to git, so >> I want to confirm I didn''t make anything wrong, and there is no >> changes after that? And also, all pv_dom0 work should base on >> xen/dom0/hackery branch, am I right? > > xen/dom0/hackery was left behind a bit during the attempt to > get dom0 into > 2.6.30 during the merge window. Alternate branches to use are > push2/xen/dom0/master and xen-tip/next . I believe the plan is that > xen-tip/next will become the branch to use, but not all the patches > from the other branches have been copied across yet. > > Michael Young > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xensource.com > http://lists.xensource.com/xen-devel_______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
On Mon, 20 Apr 2009, Jiang, Yunhong wrote:> Thanks for your information. Seems xen-tip/next is changed in April 14 > while push2/xen/dom0/master is still in Mar 29. Can I assume all patch > is hackery or push2/xen/dom0/master is in xen-tip/next already? If yes, > I will base my patch on xen-tip/next.Unfortunately no. I would imagine the most or all of the patches in push2/xen/dom0/master are in xen-tip/next, but there may be some more in hackery that haven''t been copied across yet. Michael Young _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Thanks. I will have a try firstly. --jyh M A Young wrote:> On Mon, 20 Apr 2009, Jiang, Yunhong wrote: > >> Thanks for your information. Seems xen-tip/next is changed in April >> 14 while push2/xen/dom0/master is still in Mar 29. Can I assume all >> patch is hackery or push2/xen/dom0/master is in xen-tip/next >> already? If yes, I will base my patch on xen-tip/next. > > Unfortunately no. I would imagine the most or all of the patches in > push2/xen/dom0/master are in xen-tip/next, but there may be some > more in hackery that haven''t been copied across yet. > > Michael Young_______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Jiang, Yunhong wrote:> Thanks for your information. Seems xen-tip/next is changed in April 14 while push2/xen/dom0/master is still in Mar 29. Can I assume all patch is hackery or push2/xen/dom0/master is in xen-tip/next already? If yes, I will base my patch on xen-tip/next.Yes, that would work. Though preferably you could base your topic branch on the most appropriate topic branch and work on that (so that unrelated upstream changes don''t have an impact on your work). J _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Thanks. I will do that. --jyh Jeremy Fitzhardinge wrote:> Jiang, Yunhong wrote: >> Thanks for your information. Seems xen-tip/next is changed > in April 14 while push2/xen/dom0/master is still in Mar 29. > Can I assume all patch is hackery or push2/xen/dom0/master is > in xen-tip/next already? If yes, I will base my patch on xen-tip/next. > > Yes, that would work. Though preferably you could base your topic > branch on the most appropriate topic branch and work on that (so that > unrelated upstream changes don''t have an impact on your work). > > J_______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel