| |
|
 |
|
 |
|
|
|
| |
|
|
xen-devel
[Xen-devel] linux-next: manual merge of the xen tree with the swiotlb-xe
|
To: |
Jeremy Fitzhardinge <jeremy@xxxxxxxx>, Xen Devel <Xen-devel@xxxxxxxxxxxxxxxxxxx> |
|
Subject: |
[Xen-devel] linux-next: manual merge of the xen tree with the swiotlb-xen tree |
|
From: |
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> |
|
Date: |
Mon, 18 Oct 2010 15:52:49 +1100 |
|
Cc: |
Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>, linux-kernel@xxxxxxxxxxxxxxx, linux-next@xxxxxxxxxxxxxxx, Konrad, Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>, Linus <torvalds@xxxxxxxxxxxxxxxxxxxx> |
|
Delivery-date: |
Sun, 17 Oct 2010 21:53:54 -0700 |
|
Envelope-to: |
www-data@xxxxxxxxxxxxxxxxxxx |
|
List-help: |
<mailto:xen-devel-request@lists.xensource.com?subject=help> |
|
List-id: |
Xen developer discussion <xen-devel.lists.xensource.com> |
|
List-post: |
<mailto:xen-devel@lists.xensource.com> |
|
List-subscribe: |
<http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe> |
|
List-unsubscribe: |
<http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe> |
|
Sender: |
xen-devel-bounces@xxxxxxxxxxxxxxxxxxx |
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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
pgpO3cQtwe8ux.pgp
Description: PGP signature
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
| <Prev in Thread] |
Current Thread |
[Next in Thread>
|
- [Xen-devel] linux-next: manual merge of the xen tree with the swiotlb-xen tree,
Stephen Rothwell <=
|
|
|
| |
|
Home