[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Xen-devel] Re: 2.6.39 merge window (git pulls and what is planned to go in)
On Wed, 2011-03-16 at 15:58 +0000, Konrad Rzeszutek Wilk wrote:
> > > 2/5 depends on Rafael tree so will have to wait until that gets merged in.
> > > But we can definitly push those two (1/5 and 2/5) right when Rafael's tree
> > > has been merged.
> >
> > Does it? Why?
> >
> > If it's just the minor conflict in arch/x86/xen/Kconfig I say throw it
> > in and let it get resolved at merge time.
>
> I get this rejection:
[...]
Did you take 1/5? 2/5 needs it.
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
