Re: [Xen-devel] [PATCH 1 of 3] Move libxl_device_pci_reset in to libxl_pci.c

[Gianni Tedesco <gianni.tedesco@xxxxxxxxxx>]

On Thu, 2010-07-29 at 16:37 +0100, Ian Jackson wrote:
> Gianni Tedesco writes ("[Xen-devel] [PATCH 1 of 3] Move 
> libxl_device_pci_reset in to libxl_pci.c"):
> >  tools/libxl/libxl_device.c |  34 ----------------------------------
> >  tools/libxl/libxl_pci.c    |  33 +++++++++++++++++++++++++++++++++
> >  2 files changed, 33 insertions(+), 34 deletions(-)
> 
> This patch does not apply to tip.  Have you pulled recently ?  I guess
> Ian Campbell's struct typedef consistency patch is causing the
> conflicts.

Damnit, pulled (cloned afresh infact) right before putting together the
patch set. Things are just moving to fast to keep up :)

Will re-base and re-send.


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel