Re: Change name from swiotlb-xen to xen-two tree and branches.

From: Sedat Dilek
Date: Sat Jan 22 2011 - 04:34:12 EST


On Sat, Jan 22, 2011 at 2:09 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi Konrad,
>
> On Fri, 21 Jan 2011 11:45:01 -0500 Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx> wrote:
[...]
>> Would you be OK changing the name from swiotlb-xen to 'xen-two' and
>> pulling from #linux-next branch instead of #master please?
>
> All done - but my next tree will not be built until Jan 31 ...
>

It would be great to have a linux-next based on 2.6.38-rc2 before LCA-2011.
The only conflict I had to solve was in "arch/x86/xen/p2m.c" (for
details see [1]).

- Sedat -

[1] "xen: p2m: correctly initialize partial p2m leaf"
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=8e1b4cf2108488ccfb9a3e7ed7cd85a435e01d4b
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/