lkml.org 
[lkml]   [2010]   [Oct]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the xen tree with the swiotlb-xen tree
Hi all,

Today's linux-next merge of the xen tree got conplex conflicts in
drivers/xen/events.c between several commits from the swiotlb-xen tree
and several commits from the xen tree.

I am unqualified to fix this mess, sorry. I am dropping the xen tree
for today (and only not dropping the swiotlb-xen tree because that would
be too much work).

I wonder, of course, why I have seen nothing in either of these trees
until today (less than a week before the merge window opens).

Please sort this mess out. I will drop the swiotlb-xen tree as well
tomorrow if nothing has changed.

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2010-10-18 06:55    [W:0.064 / U:0.344 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site