Re: linux-next: Tree for October 20 (xen)

[Konrad Rzeszutek Wilk]

On Wed, Oct 20, 2010 at 09:28:36AM -0700, Randy Dunlap wrote:
> On Wed, 20 Oct 2010 16:20:53 +1100 Stephen Rothwell wrote:
> 
> > Hi all,
> > 
> > Changes since 20101019:
> > 
> > 
> > The swiotlb-xen tree gained a conflict against the pci tree.
> 
> 
> linux-next-20101020/drivers/xen/biomerge.c: In function 'xen_biovec_phys_mergeable':
> linux-next-20101020/drivers/xen/biomerge.c:8: error: dereferencing pointer to incomplete type
> linux-next-20101020/drivers/xen/biomerge.c:9: error: dereferencing pointer to incomplete type
> linux-next-20101020/drivers/xen/biomerge.c:11: error: implicit declaration of function '__BIOVEC_PHYS_MERGEABLE'

Ok, this patch fixes it. I am sticking it in my tree: