From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755679AbbFLPBI (ORCPT ); Fri, 12 Jun 2015 11:01:08 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:45682 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755472AbbFLPBE (ORCPT ); Fri, 12 Jun 2015 11:01:04 -0400 Date: Fri, 12 Jun 2015 09:01:00 -0600 From: Jens Axboe To: CC: Subject: [GIT PULL] Few simple fixups for 4.1 final Message-ID: <20150612150100.GA7413@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-12_03:2015-06-11,2015-06-12,1970-01-01 signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, Remember about a week ago when I sent the last pull request for 4.1? Well, I lied. Now, I don't want to shift the blame, but Dan, Ming, and Richard made a liar out of me. Here are three small patches that should go into 4.1. More specifically, this pull request contains: - A Kconfig dependency for the pmem block driver, so it can't be selected if HAS_IOMEM isn't availble. From Richard Weinberger. - A fix for genhd, making the ext_devt_lock softirq safe. This makes lockdep happier, since we also end up grabbing this lock on release off the softirq path. From Dan Williams. - A blk-mq software queue release fix from Ming Lei. Last two are headed to stable, first fixes an issue introduced in this cycle. Please pull! git://git.kernel.dk/linux-block.git for-linus ---------------------------------------------------------------- Dan Williams (1): block: fix ext_dev_lock lockdep report Ming Lei (1): blk-mq: free hctx->ctxs in queue's release handler Richard Weinberger (1): block: pmem: Add dependency on HAS_IOMEM block/blk-mq.c | 8 ++++++-- block/genhd.c | 12 ++++++------ drivers/block/Kconfig | 1 + 3 files changed, 13 insertions(+), 8 deletions(-) -- Jens Axboe