Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1241792

Re: [GIT PULL] (xen) for-jens-4.3 for your 'for-4.3/drivers' branch

Show all headers | View raw

On Wed, Oct 07, 2015 at 01:53:01PM -0600, Jens Axboe wrote:
> On 10/07/2015 01:26 PM, Konrad Rzeszutek Wilk wrote:
> >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 'stable@vger.kernel.org' 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
> 
> 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).

> 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!
> 
> -- 
> Jens Axboe
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[GIT PULL] (xen) for-jens-4.3  for your 'for-4.3/drivers' branch Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> - 2015-10-07 21:30 +0200
  Re: [GIT PULL] (xen) for-jens-4.3 for your 'for-4.3/drivers' branch Jens Axboe <axboe@fb.com> - 2015-10-07 22:00 +0200
    Re: [GIT PULL] (xen) for-jens-4.3 for your 'for-4.3/drivers' branch Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> - 2015-10-07 22:40 +0200
      Re: [GIT PULL] (xen) for-jens-4.3 for your 'for-4.3/drivers' branch Jens Axboe <axboe@fb.com> - 2015-10-07 22:50 +0200

csiph-web