Skip to contentSkip to conversation

(xen) for-jens-4.3 for your 'for-4.3/drivers' branch

GIT PULL Konrad Rzeszutek Wilk 2 participants 4 messages Oct 7, 2015

lore
Share & tools
lore
#0 lore raw

Hey Jens,

Please git pull an update branch to your 'for-4.3/drivers' branch (which oddly I don't see does not have the previous pull?)

git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git stable/for-jens-4.3

which has two fixes - one where we use the Xen blockfront EFI driver and don't release all the requests, the other if the allocation of resources for a particular state failed - we would go back 'Closing' and assume that an structure would be allocated while in fact it may not be - and crash.

Please pull!

P.S.
The patches also have '[email protected]' on them.

 drivers/block/xen-blkback/xenbus.c | 38 ++++++++++++++++++++------------------
 drivers/block/xen-blkfront.c       |  3 ++-
 2 files changed, 22 insertions(+), 19 deletions(-)

Cathy Avery (1):
xen-blkfront: check for null drvdata in blkback_changed (XenbusStateClosing)

Roger Pau Monne (1):
xen/blkback: free requests on disconnection

#1 lore raw
Quoted 21 lines · Konrad Rzeszutek Wilk

Hey Jens,

Please git pull an update branch to your 'for-4.3/drivers' branch (which oddly I don't see does not have the previous pull?)

git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git stable/for-jens-4.3

which has two fixes - one where we use the Xen blockfront EFI driver and don't release all the requests, the other if the allocation of resources for a particular state failed - we would go back 'Closing' and assume that an structure would be allocated while in fact it may not be - and crash.

Please pull!

P.S.
The patches also have '[email protected]' on them.

  drivers/block/xen-blkback/xenbus.c | 38 ++++++++++++++++++++------------------
  drivers/block/xen-blkfront.c       |  3 ++-
  2 files changed, 22 insertions(+), 19 deletions(-)
Quoted 5 lines

Cathy Avery (1):
xen-blkfront: check for null drvdata in blkback_changed (XenbusStateClosing)

Roger Pau Monne (1):
xen/blkback: free requests on disconnection

There's only one commit in that pull request, the patch from Roger is already in mainline from the last pull request. I think your mistake is looking at for-4.3/drivers - this branch is defunct as soon as Linus has pulled the initial bits for 4.3. After that, for-linus is the branch that carries fixes for the _current_ branch.

Signature · 1 line
Jens Axboe
#2 lore raw
Quoted 22 lines · Jens Axboe
Quoted 21 lines · Konrad Rzeszutek Wilk

Hey Jens,

Please git pull an update branch to your 'for-4.3/drivers' branch (which oddly I don't see does not have the previous pull?)

git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git stable/for-jens-4.3

which has two fixes - one where we use the Xen blockfront EFI driver and don't release all the requests, the other if the allocation of resources for a particular state failed - we would go back 'Closing' and assume that an structure would be allocated while in fact it may not be - and crash.

Please pull!

P.S.
The patches also have '[email protected]' on them.

 drivers/block/xen-blkback/xenbus.c | 38 ++++++++++++++++++++------------------
 drivers/block/xen-blkfront.c       |  3 ++-
 2 files changed, 22 insertions(+), 19 deletions(-)
Quoted 8 lines
Quoted 5 lines

Cathy Avery (1):
xen-blkfront: check for null drvdata in blkback_changed (XenbusStateClosing)

Roger Pau Monne (1):
xen/blkback: free requests on disconnection

There's only one commit in that pull request, the patch from Roger is already in mainline from the last pull request. I think your mistake is

Hm, indeed I see it now (after doing git pull from non-work machine).

Quoted 3 lines

looking at for-4.3/drivers - this branch is defunct as soon as Linus has pulled the initial bits for 4.3. After that, for-linus is the branch that carries fixes for the _current_ branch.

Aaaa! That I had no clue about. OK, I will fix my workflow. Do you want me to repost this basing it on the 'for-linus' branch?

Thanks!

Quoted 4 lines
Signature · 2 lines
-- 
Jens Axboe
#3 lore raw
Quoted 32 lines · Konrad Rzeszutek Wilk
Quoted 22 lines · Jens Axboe
Quoted 21 lines · Konrad Rzeszutek Wilk

Hey Jens,

Please git pull an update branch to your 'for-4.3/drivers' branch (which oddly I don't see does not have the previous pull?)

git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git stable/for-jens-4.3

which has two fixes - one where we use the Xen blockfront EFI driver and don't release all the requests, the other if the allocation of resources for a particular state failed - we would go back 'Closing' and assume that an structure would be allocated while in fact it may not be - and crash.

Please pull!

P.S.
The patches also have '[email protected]' on them.

  drivers/block/xen-blkback/xenbus.c | 38 ++++++++++++++++++++------------------
  drivers/block/xen-blkfront.c       |  3 ++-
  2 files changed, 22 insertions(+), 19 deletions(-)
Quoted 8 lines
Quoted 5 lines

Cathy Avery (1):
xen-blkfront: check for null drvdata in blkback_changed (XenbusStateClosing)

Roger Pau Monne (1):
xen/blkback: free requests on disconnection

There's only one commit in that pull request, the patch from Roger is already in mainline from the last pull request. I think your mistake is

Quoted 8 lines

Hm, indeed I see it now (after doing git pull from non-work machine).

Quoted 3 lines

looking at for-4.3/drivers - this branch is defunct as soon as Linus has pulled the initial bits for 4.3. After that, for-linus is the branch that carries fixes for the _current_ branch.

Aaaa! That I had no clue about. OK, I will fix my workflow. Do you want me to repost this basing it on the 'for-linus' branch?

No the current one is fine, it's only a concern if there are other changes in your branch compared to mine. I just got a different diffstat for this one than you listed, so I had to check it more thoroughly.

I have pulled it in.

Signature · 1 line
Jens Axboe