RE: [Xen-devel][Pv-ops][PATCH 1/4 v2] Netback: Generilize static/global variables into 'struct xen_netbk'.

["Xu, Dongxiao" <dongxiao.xu@xxxxxxxxx>]

Konrad Rzeszutek Wilk wrote:
The patchset is based on xen/master tree. 
I saw some merges in xen/master/netback is not contained in
xen/next/netback, for example, the foreign_page_tracker.

So I rebased my work on xen/master tree.

Thanks,
Dongxiao

> On Thu, Apr 29, 2010 at 10:28:18PM +0800, Xu, Dongxiao wrote:
>> Netback: Move global/static variables into struct xen_netbk.
>> 
>> Signed-off-by: Dongxiao Xu <dongxiao.xu@xxxxxxxxx>
> 
> Hmm..
> 
> git checkout jeremy/xen/next -b test-netbk-kthread -f
> Branch test-netbk-kthread set up to track remote branch
> refs/remotes/jeremy/xen/next.
> Switched to a new branch 'test-netbk-kthread'
> [konrad@phenom linux]$ git reset --hard
> HEAD is now at 5403063 Merge remote branch
> 'stefano-pvhvm/2.6.32-pvhvm' into xen/next [konrad@phenom linux]$
> patch -p1 <
> ~/0001-Netback-Move-global-static-variables-into-struct-xe.patch
> patching file drivers/xen/netback/common.h  
> patching file drivers/xen/netback/netback.c
> Hunk #1 succeeded at 48 (offset -1 lines).
> Hunk #2 succeeded at 64 (offset -1 lines).
> Hunk #3 succeeded at 90 (offset -1 lines).
> Hunk #4 FAILED at 105.
> Hunk #5 succeeded at 151 (offset -3 lines).
> Hunk #6 succeeded at 305 (offset -3 lines).
> Hunk #7 succeeded at 463 (offset -1 lines).
> Hunk #8 succeeded at 490 (offset -1 lines).
> Hunk #9 succeeded at 530 (offset -1 lines).
> Hunk #10 succeeded at 547 (offset -1 lines).
> Hunk #11 succeeded at 560 (offset -1 lines).
> .. snip..
> 5 out of 44 hunks FAILED -- saving rejects to file
> drivers/xen/netback/netback.c.rej
> 
> ... what branch are these patches against?


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