Messages in this thread | | | Subject | Re: [GIT PULL] (xen) for-jens-4.3 for your 'for-4.3/drivers' branch | From | Jens Axboe <> | Date | Wed, 7 Oct 2015 14:34:22 -0600 |
| |
On 10/07/2015 02:32 PM, Konrad Rzeszutek Wilk wrote: > 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?
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.
-- Jens Axboe
| |