Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933125AbdC2V1O (ORCPT ); Wed, 29 Mar 2017 17:27:14 -0400 Received: from mail-it0-f49.google.com ([209.85.214.49]:38146 "EHLO mail-it0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933024AbdC2V1M (ORCPT ); Wed, 29 Mar 2017 17:27:12 -0400 To: Linus Torvalds Cc: "linux-block@vger.kernel.org" , "linux-kernel@vger.kernel.org" From: Jens Axboe Subject: [GIT PULL] Block fixes for 4.11-rc Message-ID: <79350b18-c4c9-b445-66f4-7c614f57c180@kernel.dk> Date: Wed, 29 Mar 2017 15:27:04 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 972 Lines: 35 Hi Linus, 5 fixes for this series. This pull request contains: - A fix from me to ensure that blk-mq drivers that terminate IO in their ->queue_rq() handler by returning QUEUE_ERROR don't stall with a scheduler enabled. - 4 nbd fixes from Josef and Ratna, fixing various problems that are critical enough to go in for this cycle. They have been well tested. Please pull! git://git.kernel.dk/linux-block.git for-linus ---------------------------------------------------------------- Jens Axboe (1): blk-mq: include errors in did_work calculation Josef Bacik (3): nbd: handle ERESTARTSYS properly nbd: set rq->errors to actual error code nbd: set queue timeout properly Ratna Manoj Bolla (1): nbd: replace kill_bdev() with __invalidate_device() block/blk-mq.c | 7 +-- drivers/block/nbd.c | 136 +++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 107 insertions(+), 36 deletions(-) -- Jens Axboe