From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754134AbbDGO4r (ORCPT ); Tue, 7 Apr 2015 10:56:47 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:18492 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752911AbbDGO4q (ORCPT ); Tue, 7 Apr 2015 10:56:46 -0400 Date: Tue, 7 Apr 2015 10:56:39 -0400 From: Konrad Rzeszutek Wilk To: linux-kernel@vger.kernel.org, axboe@fb.com Cc: roger.pau@citrix.com Subject: [GIT PULL] (xen) stable/for-jens-4.1 Message-ID: <20150407145639.GB26061@l.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Source-IP: aserv0021.oracle.com [141.146.126.233] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hey Jens, Please git pull the following tree: git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git stable/for-jens-4.1 which is based on your for-4.1/drivers branch. Specifically commit de9ad6d4edb63e0ba5d5aae365fb3565064fc00d "nbd: Return error pointer directly". This pull has one fix and an cleanup. Note that David Vrabel in the xen/tip.git tree has other changes for the Xen block drivers that are related to his grant work - and they do not conflict with this git pull. Thank you! drivers/block/xen-blkback/blkback.c | 62 ++++++++++++++++++------------------- drivers/block/xen-blkback/common.h | 6 ---- drivers/block/xen-blkback/xenbus.c | 38 ++++++++++++++--------- 3 files changed, 54 insertions(+), 52 deletions(-) Tao Chen (2): xen-blkback: enlarge the array size of blkback name xen-blkback: define pr_fmt macro to avoid the duplication of DRV_PFX