Merge remote-tracking branch 'xen-two/linux-next'

diff --cc drivers/block/xen-blkback/common.h
index de09f525d6c174509af3a1e25ce6609fbb2ef1fc,7ec0e8896a786ab69f5cd714fed52d05014828d3..dfb1b3a43a5ddc2edbe9310a1ab43af40a71c117
--- 1/drivers/block/xen-blkback/common.h
--- 2/drivers/block/xen-blkback/common.h
+++ b/drivers/block/xen-blkback/common.h
@@@ -168,9 -138,8 +168,9 @@@ struct xen_blkif 
        unsigned int            irq;
        /* Comms information. */
        enum blkif_protocol     blk_protocol;
 +      enum blkif_backend_type blk_backend_type;
        union blkif_back_rings  blk_rings;
-       struct vm_struct        *blk_ring_area;
+       void                    *blk_ring;
        /* The VBD attached to this interface. */
        struct xen_vbd          vbd;
        /* Back pointer to the backend_info. */

diff --cc drivers/block/xen-blkback/xenbus.c
Simple merge

diff --cc drivers/net/xen-netback/netback.c
Simple merge