From mboxrd@z Thu Jan  1 00:00:00 1970
From: =?utf-8?q?=C5=81ukasz_Ole=C5=9B?= <lukaszoles@gmail.com>
Subject: Re: upstream merge status for 2.6.35, .36?
Date: Wed, 4 Aug 2010 23:09:01 +0200
Message-ID: <201008042309.01975.lukaszoles@gmail.com>
References: <20100604223929.GA8819@orion.carnet.hr>
	<20100804194457.GA6914@orion.carnet.hr>
	<20100804201100.GA16839@phenom.dumpdata.com>
Mime-Version: 1.0
Content-Type: Text/Plain;
  charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <20100804201100.GA16839@phenom.dumpdata.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

On Wednesday 04 August 2010 22:11:00 Konrad Rzeszutek Wilk wrote:
> On Wed, Aug 04, 2010 at 09:44:57PM +0200, Josip Rodin wrote:
> > On Mon, Jun 07, 2010 at 10:57:43AM -0400, Konrad Rzeszutek Wilk wrote:
> > > So the SWIOTLB is 1 out 3. The next component is:
> > >=20
> > > 2). Xen SWIOTLB. This is the xen swiotlb code that utilizes the swiot=
lb
> > > proper that was just made generic enough to be used in this capacity.
> > > git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6.git
> > > xen-swiotlb-0.8.2
> > >=20
> > > 3). and then the Xen PCI front. Which utilizes the Xen-SWIOTLB (and
> > > also the Xen PCI), to well, allow guests to have PCI devices passed
> > > in.
> > >=20
> > > git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git
> > > pv/pcifront-2.6.34
> > >=20
> > > The 2) and 3) are mostly Xen specific so they should be much more
> > > palpable than the first one.
> >=20
> > JFTR these now look to be:
> >=20
> > http://lkml.org/lkml/2010/8/2/289 [ SWIOTLB GIT PULL ]
> > http://lkml.org/lkml/2010/7/27/246 [ Xen-SWIOTLB]
> > http://lkml.org/lkml/2010/8/4/374 [ RFC Xen PCI patches]
> >=20
> > But in the latter you wrote that you don't expect #2 to get in the 2.6.=
36
> > merge window. Why? I saw a single tentative complaint from hpa on one
>=20
> No. The #2 is right now brewing in linux-next and I am thinking to ask
> Linus to pull it next week.

Linus merged it today=20
http://git.kernel.org/?p=3Dlinux/kernel/git/torvalds/linux-2.6.git;a=3Dcomm=
it;h=3D4a35cee066df1b1958e25e71595b3845d06b192e =20
:)

=2D-
=C5=81ukasz Ole=C5=9B