Re: [PATCH 00 of 10] blkfront pvops updates

[Jeremy Fitzhardinge <jeremy@goop.org>]

On 04/28/2010 07:19 PM, Daniel Stodden wrote:
> Hi.
>
> Here are couple of bugfixes for blkfront.
>
>  1. Bdev removal was slightly buggy. [Is nobody out there using
>     block-detach??] Also it seems like we'be been leaking the gendisk
>     structs for a long time.
>
>  2. Fixes most common occasions where disk open/close races against
>     backend state switches. This one didn't come for free:
> 	* xenbus_switch_state growing transactions again.
> 	* New mutex in blkfront_info
> 	* Bdev .open/.close rewritten accordingly.
>   

Thanks for this.  However, when I went to apply it, it looks like I've
made a mess of the various blkfront branches. 

xen/frontend has some changes from Jan and Ky which are merged into
xen/next and the various stable branches.

I also have xen/blkfront, which has your last set of changes, which I
seem to have forgotten to merge into anything else, and now conflicts
non-trivially with xen/blkfront.  I'd like to add this new set of
patches into xen/blkfront, but it doesn't apply cleanly.

Could you look at this and advise me what I should do?

Thanks,
    J
> Cheers,
> Daniel
>
>