2015-02-10 12:58:48

by Roger Pau Monne

[permalink] [raw]
Subject: [GIT PULL] (xen) for-jens-3.20 for v3.20 Xen blk driver updates

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hello Jens,

There are 3 fixes for Xen blk drivers. One adds myself as a maintainer
(together with Konrad). There's also one to improve compatibility with
older xen-blkfront versions that did not specify a protocol version.
The remaining one is a fix for blkfront to correctly account the
number of requests on the queue when resuming from suspension.

Thanks, Roger.

The following changes since commit
e36f014edff70fc02b3d3d79cead1d58f289332e:

Linux 3.19-rc7 (2015-02-01 20:07:21 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git for-jens-3.20

for you to fetch changes up to d69dbb6ca88c41698dd1cba84926926bdf789f7e:

xen-blkback: default to X86_32 ABI on x86 (2015-02-10 10:23:18 +0000)

- ----------------------------------------------------------------
David Vrabel (1):
xen-blkback: default to X86_32 ABI on x86

Roger Pau Monne (2):
xen-blkback,xen-blkfront: add myself as maintainer
xen-blkfront: fix accounting of reqs when migrating

MAINTAINERS | 1 +
drivers/block/xen-blkback/common.h | 9 +++++++++
drivers/block/xen-blkback/xenbus.c | 4 ++--
drivers/block/xen-blkfront.c | 4 ++--
4 files changed, 14 insertions(+), 4 deletions(-)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQEcBAEBAgAGBQJU2gCDAAoJEKXZdqUyumTA0FoH/0QGrP26AyHCMF0U79ZpHaZM
q1cFOU+Rn++e0tGc7tvSVELuTd3Rpxo4RTMpVqcBc2USbzdptKxgsobdlQXM6ySD
R3rKIqt00Ugg1jBBeV3/+kb7M/tku5C0BFFJNDYL7TRd+9wbodsEDGhSgQh1X3XU
3S6miVQ6RGhBti0WJhpg6TeJC8Km8fkIVW7+6RL5cHB4hmFfIGxWHX9WPjPchjqd
xP1EOs+qt8YGKrftLB1VCVGXMoXfv47/JVB/pb55c2VtRuEA3cBPlSe/+Q+8Ntc9
ZJjyHHm9cNvGToRxBLok1vyOb/gsmAigJ1463BqJ5oSgEBZhGcZ4ovF2gwr9EC0=
=oUXg
-----END PGP SIGNATURE-----


2015-02-10 15:27:48

by Jens Axboe

[permalink] [raw]
Subject: Re: [GIT PULL] (xen) for-jens-3.20 for v3.20 Xen blk driver updates

On 02/10/2015 05:58 AM, Roger Pau Monné wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Hello Jens,
>
> There are 3 fixes for Xen blk drivers. One adds myself as a maintainer
> (together with Konrad). There's also one to improve compatibility with
> older xen-blkfront versions that did not specify a protocol version.
> The remaining one is a fix for blkfront to correctly account the
> number of requests on the queue when resuming from suspension.
>
> Thanks, Roger.
>
> The following changes since commit
> e36f014edff70fc02b3d3d79cead1d58f289332e:
>
> Linux 3.19-rc7 (2015-02-01 20:07:21 -0800)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git for-jens-3.20

This is based on 3.19-rc7, which means that when I pulled it into
for-3.20/drivers, I get a ton of unrelated commits as well. That's no
good. The pull request should be based on for-3.20/drivers or earlier.
So please rebase the three patches on top of for-3.20/drivers. Konrad
does the right thing here. Not sure if you are going to be sending pull
requests going forward (or both of you), but it might not hurt to sync
up with Konrad and ensure you guys are on the same page.

Secondly, this is a bit late. But since it's just two fixes (not
features) and a maintainer update, it's not a huge deal. It's a bit
annoying though since every pull request like this will push my pull
request by a day or two, so generally I prefer to have pull requests at
least the week before the merge window opens.

--
Jens Axboe

2015-02-10 16:10:18

by David Vrabel

[permalink] [raw]
Subject: Re: [GIT PULL] (xen) for-jens-3.20 for v3.20 Xen blk driver updates

On 10/02/15 15:27, Jens Axboe wrote:
> On 02/10/2015 05:58 AM, Roger Pau Monné wrote:
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> Hello Jens,
>>
>> There are 3 fixes for Xen blk drivers. One adds myself as a maintainer
>> (together with Konrad). There's also one to improve compatibility with
>> older xen-blkfront versions that did not specify a protocol version.
>> The remaining one is a fix for blkfront to correctly account the
>> number of requests on the queue when resuming from suspension.
>>
>> Thanks, Roger.
>>
>> The following changes since commit
>> e36f014edff70fc02b3d3d79cead1d58f289332e:
>>
>> Linux 3.19-rc7 (2015-02-01 20:07:21 -0800)
>>
>> are available in the git repository at:
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git for-jens-3.20
>
> This is based on 3.19-rc7, which means that when I pulled it into
> for-3.20/drivers, I get a ton of unrelated commits as well.

Sorry Jens, that was my fault. I prepared the branch because Konrad has
been too busy and Roger doesn't have a kernel.org account yet.

I've now rebased this branch on your for-3.20/drivers branch.

David

2015-02-10 16:12:55

by Jens Axboe

[permalink] [raw]
Subject: Re: [GIT PULL] (xen) for-jens-3.20 for v3.20 Xen blk driver updates

On 02/10/2015 09:10 AM, David Vrabel wrote:
> On 10/02/15 15:27, Jens Axboe wrote:
>> On 02/10/2015 05:58 AM, Roger Pau Monné wrote:
>>> -----BEGIN PGP SIGNED MESSAGE-----
>>> Hash: SHA1
>>>
>>> Hello Jens,
>>>
>>> There are 3 fixes for Xen blk drivers. One adds myself as a maintainer
>>> (together with Konrad). There's also one to improve compatibility with
>>> older xen-blkfront versions that did not specify a protocol version.
>>> The remaining one is a fix for blkfront to correctly account the
>>> number of requests on the queue when resuming from suspension.
>>>
>>> Thanks, Roger.
>>>
>>> The following changes since commit
>>> e36f014edff70fc02b3d3d79cead1d58f289332e:
>>>
>>> Linux 3.19-rc7 (2015-02-01 20:07:21 -0800)
>>>
>>> are available in the git repository at:
>>>
>>> git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git for-jens-3.20
>>
>> This is based on 3.19-rc7, which means that when I pulled it into
>> for-3.20/drivers, I get a ton of unrelated commits as well.
>
> Sorry Jens, that was my fault. I prepared the branch because Konrad has
> been too busy and Roger doesn't have a kernel.org account yet.
>
> I've now rebased this branch on your for-3.20/drivers branch.

Looks better now, thanks, pulled into for-3.20/drivers.

--
Jens Axboe