From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754092AbbF2Uu4 (ORCPT ); Mon, 29 Jun 2015 16:50:56 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:4567 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752671AbbF2Uut (ORCPT ); Mon, 29 Jun 2015 16:50:49 -0400 Date: Mon, 29 Jun 2015 14:50:37 -0600 From: Jens Axboe To: CC: Subject: [GIT PULL] Follow-up block pull request for 4.2-rc1 Message-ID: <20150629205037.GA5532@kernel.dk> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline X-Originating-IP: [192.168.54.13] X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.14.151,1.0.33,0.0.0000 definitions=2015-06-29_04:2015-06-29,2015-06-29,1970-01-01 signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, A few later arrivers that I didn't fold into the first pull request, so we had a chance to run some testing. This pull request contains: - NVMe: - Set of fixes from Keith - 4.4 and earlier gcc build fix from Andrew - Small set of xen-blk{back,front} fixes from Bob Liu. - Warnings fix for bogus inline statement in I_BDEV() from Geert. - Error code fixup for SG_IO ioctl from Paolo Bonzini. Please pull for this merge window! Thanks. git://git.kernel.dk/linux-block.git for-linus ---------------------------------------------------------------- Andrew Morton (1): drivers/block/nvme-core.c: fix build with gcc-4.4.4 Bob Liu (4): drivers: xen-blkback: delay pending_req allocation to connect_ring driver: xen-blkfront: move talk_to_blkback to a more suitable place xen/block: add multi-page ring support drivers: xen-blkfront: only talk_to_blkback() when in XenbusStateInitialising Geert Uytterhoeven (1): bdi: Remove "inline" keyword from exported I_BDEV() implementation Jens Axboe (1): Merge branch 'stable/for-jens-4.2' of git://git.kernel.org/.../konrad/xen into for-linus Keith Busch (5): NVMe: Fix device cleanup on initialization failure NVMe: Don't use fake status on cancelled command NVMe: Unify controller probe and resume NVMe: Failed controller initialization fixes NVMe: Fix filesystem deadlock on removal Paolo Bonzini (1): block: fix bogus EFAULT error from SG_IO ioctl block/scsi_ioctl.c | 4 +- drivers/block/nvme-core.c | 138 ++++++++++++++++------------- drivers/block/xen-blkback/blkback.c | 13 +++ drivers/block/xen-blkback/common.h | 4 +- drivers/block/xen-blkback/xenbus.c | 167 +++++++++++++++++++++++------------- drivers/block/xen-blkfront.c | 151 ++++++++++++++++++++++---------- fs/block_dev.c | 2 +- 7 files changed, 308 insertions(+), 171 deletions(-) -- Jens Axboe