From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751532AbbKYSYp (ORCPT ); Wed, 25 Nov 2015 13:24:45 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:47805 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752088AbbKYSYg (ORCPT ); Wed, 25 Nov 2015 13:24:36 -0500 Date: Wed, 25 Nov 2015 11:24:30 -0700 From: Jens Axboe To: CC: , Subject: [GIT PULL] Block followup fixes for 4.4-rc3 Message-ID: <20151125182430.GA10504@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:,, definitions=2015-11-25_12:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, Wasn't going to send off a new pull before next week, but the blk flush fix from Jan from the other day introduced a regression. It's rare enough not to have hit during testing, since it requires both a device that rejects the first flush, and bad timing while it does that. But since someone did hit it, let's get the revert into 4.4-rc3 so we don't have a released rc with that known issue. Apart from that revert, three other fixes: - From Christoph, a fix for a missing unmap in NVMe request preparation. - An NVMe fix from Nishanth that fixes data corruption on powerpc. - Also from Christoph, fix a list_del() attempt on blk-mq that didn't have a matching list_add() at timer start. Please pull! git://git.kernel.dk/linux-block.git for-linus ---------------------------------------------------------------- Christoph Hellwig (2): nvme: add missing unmaps in nvme_queue_rq block: fix blk_abort_request for blk-mq drivers Jens Axboe (1): Revert "blk-flush: Queue through IO scheduler when flush not required" Nishanth Aravamudan (1): NVMe: default to 4k device page size block/blk-flush.c | 2 +- block/blk-timeout.c | 8 +++++--- drivers/nvme/host/pci.c | 30 ++++++++++++++++++------------ 3 files changed, 24 insertions(+), 16 deletions(-) -- Jens Axboe