linux-kernel - Re: linux-next: manual merge of the xen tree with the swiotlb-xen tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <4CBC014D.7070302@goop.org>
Date:	Mon, 18 Oct 2010 01:11:57 -0700
From:	Jeremy Fitzhardinge <jeremy@...p.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Xen Devel <Xen-devel@...ts.xensource.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Linus <torvalds@...ux-foundation.org>
Subject: Re: linux-next: manual merge of the xen tree with the swiotlb-xen
 tree

 On 10/17/2010 09:52 PM, Stephen Rothwell wrote:
> 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).

Argh, sorry, I should have coordinated with Konrad.  I'd merged my tree
into linux-next to make sure it was OK, but I guess I overlooked something.

> 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).

I had found Xen regressions that had made it into linux-next and wanted
to sort those out before adding anything else to the mix.

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

Will do.

Thanks,
    J

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/