From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konrad Rzeszutek Wilk Subject: Re: Re: [GIT PULL] pv/pcifront-2.6.32 Date: Tue, 2 Mar 2010 17:20:10 -0500 Message-ID: <20100302222010.GA2039@phenom.dumpdata.com> References: <20100302031217.GB881@phenom.dumpdata.com> <4B8D7127.5070907@goop.org> <20100302215432.GA29262@phenom.dumpdata.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20100302215432.GA29262@phenom.dumpdata.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Jeremy Fitzhardinge Cc: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org On Tue, Mar 02, 2010 at 04:54:32PM -0500, Konrad Rzeszutek Wilk wrote: > On Tue, Mar 02, 2010 at 12:12:23PM -0800, Jeremy Fitzhardinge wrote: > > On 03/01/2010 07:12 PM, Konrad Rzeszutek Wilk wrote: > >> Hey Jeremy, > >> > >> Please pull from > >> git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git pv/pcifront-2.6.32 > >> > >> It is a back-port of the Xen PCI front driver (not the SR-IOV one, just > >> old plain one). It has been tested with a bare 2.6.32 tree > >> (pv/master.2.6.32) and with xen/next > >> > >> The merge of this is a bit hairy, so I did my own which is available in > >> the pv/xen.next.merge (which is basically xen/next + pv/pcifront-2.6.32 > >> + pv/fbfbront + xen: Allow unprivileged Xen domains to create iomap > >> pages). > >> > > > > I did a separate merge of the fbfront branch. Can you do another merge > > with just the pcifront stuff? > > Done: pv/merge.xen.next And in case you interested in a xen/stable merge: pv/merge.xen.stable > > > > (BTW, do you use git rerere? It remembers the results of previous merge > > resolutions and will apply them again if you re-merge.) > > Oooh goodies. Will start using it. > > > >> To make the PCI front driver work, another patch has to be put added in > >> the xen/next (or better yet in the swiotlb - but it really does not seem > >> to fit there), which is the "xen: Allow unprivileged Xen domains to > >> create iomap pages" (5a7357bdb10b40414d97d7582f5467e4a709bd07) > >> > > > > Do we really need that patch any more? The comment doesn't seem to bear A bit of testing shows that for xen/next +pv/pcifront-2.6.32 and xen/stable + pv/pcifront-2.6.32 that patch is not needed.