[GIT PULL] (xen) stable/blkfront for 2.6.40

[GIT PULL] (xen) stable/blkfront for 2.6.40

[Konrad Rzeszutek Wilk]

Hey Jens,

Please pull:
git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git stable/blkfront

which has changes since git commit 8e10cd74342c7f5ce259cceca36f6eba084f5d58
Linus Torvalds (1):
    Linux 2.6.39-rc5

The git commit includes a bug-fix, and a set of patches to allow the blkfront
driver to use 'feature-flush-cache' feature. The 'flush-cache' is basically
the equivalent of the new REQ_FLUSH command (the old 'feature-barrier' is
still present in the driver in case the backend supports that).

If you prefer for me to ask Linus to pull this git tree since it includes
a patch to the include/xen/interface/.. directory - I can do that as long as
you are OK with that.


Konrad Rzeszutek Wilk (2):
      xen-blkfront: Provide for 'feature-flush-cache' the BLKIF_OP_WRITE_FLUSH_CACHE operation.
      xen-blkfront: Introduce BLKIF_OP_FLUSH_DISKCACHE support.

Marek Marczykowski (1):
      xen-blkfront: fix data size for xenbus_gather in blkfront_connect


 drivers/block/xen-blkfront.c     |   51 +++++++++++++++++++++++++++----------
 include/xen/interface/io/blkif.h |   13 +++++++++
 2 files changed, 50 insertions(+), 14 deletions(-)

Re: [GIT PULL] (xen) stable/blkfront for 2.6.40

[Jens Axboe]

On 2011-05-10 19:11, Konrad Rzeszutek Wilk wrote:
> Hey Jens,
> 
> Please pull:
> git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git stable/blkfront
> 
> which has changes since git commit 8e10cd74342c7f5ce259cceca36f6eba084f5d58
> Linus Torvalds (1):
>     Linux 2.6.39-rc5
> 
> The git commit includes a bug-fix, and a set of patches to allow the blkfront
> driver to use 'feature-flush-cache' feature. The 'flush-cache' is basically
> the equivalent of the new REQ_FLUSH command (the old 'feature-barrier' is
> still present in the driver in case the backend supports that).
> 
> If you prefer for me to ask Linus to pull this git tree since it includes
> a patch to the include/xen/interface/.. directory - I can do that as long as
> you are OK with that.

I don't mind pulling it directly, that's fine. But you are based on
2.6.39-rc5, you should be based on for-2.6.40/drivers (or core) instead.
If I pull the above, I end up getting all the changes from rc4..rc5 as
well.

-- 
Jens Axboe

Re: [GIT PULL] (xen) stable/blkfront for 2.6.40

[Konrad Rzeszutek Wilk]

On Wed, May 11, 2011 at 07:53:41PM +0200, Jens Axboe wrote:
> On 2011-05-10 19:11, Konrad Rzeszutek Wilk wrote:
> > Hey Jens,
> > 
> > Please pull:
> > git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git stable/blkfront
> > 
> > which has changes since git commit 8e10cd74342c7f5ce259cceca36f6eba084f5d58
> > Linus Torvalds (1):
> >     Linux 2.6.39-rc5
> > 
> > The git commit includes a bug-fix, and a set of patches to allow the blkfront
> > driver to use 'feature-flush-cache' feature. The 'flush-cache' is basically
> > the equivalent of the new REQ_FLUSH command (the old 'feature-barrier' is
> > still present in the driver in case the backend supports that).
> > 
> > If you prefer for me to ask Linus to pull this git tree since it includes
> > a patch to the include/xen/interface/.. directory - I can do that as long as
> > you are OK with that.
> 
> I don't mind pulling it directly, that's fine. But you are based on
> 2.6.39-rc5, you should be based on for-2.6.40/drivers (or core) instead.

Easily fixed:
 git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git for-jens/xen-blkfront

is now based on your for-2.6.40/drivers.

> If I pull the above, I end up getting all the changes from rc4..rc5 as
> well.

Ah, OK. Will make sure to check your for-2.6.40 in the future. Thanks!

Re: [GIT PULL] (xen) stable/blkfront for 2.6.40

[Jens Axboe]

On 2011-05-12 15:27, Konrad Rzeszutek Wilk wrote:
> git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git for-jens/xen-blkfront

Pulled, thanks.

-- 
Jens Axboe