From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755913AbbGPR2E (ORCPT ); Thu, 16 Jul 2015 13:28:04 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:48799 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755269AbbGPR2D (ORCPT ); Thu, 16 Jul 2015 13:28:03 -0400 Date: Thu, 16 Jul 2015 11:27:58 -0600 From: Jens Axboe To: CC: Subject: [GIT PULL] Block fixes for 4.2-rc2 Message-ID: <20150716172758.GA8954@kernel.dk> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline X-Originating-IP: [192.168.52.123] 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-07-16_05:2015-07-16,2015-07-16,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 collection of fixes from the last few weeks that should go into the current series. This pull request contains: - Various fixes for the per-blkcg policy data, fixing regressions since 4.1 From Arianna and Tejun. - Code cleanup for bcache closure macros from me. Really just flushing this out, it's been sitting in another branch for months. - FIELD_SIZEOF cleanup from Maninder Singh. - bio integrity oops fix from Mike. - Timeout regression fix for blk-mq from Ming Lei. Please pull! git://git.kernel.dk/linux-block.git for-linus ---------------------------------------------------------------- Arianna Avanzini (1): block/blk-cgroup.c: free per-blkcg data when freeing the blkcg Jens Axboe (1): bcache: don't embed 'return' statements in closure macros Keith Busch (1): NVMe: Reread partitions on metadata formats Maninder Singh (1): block: use FIELD_SIZEOF to calculate size of a field Mike Snitzer (1): bio integrity: do not assume bio_integrity_pool exists if bioset exists Ming Lei (1): blk-mq: set default timeout as 30 seconds Tejun Heo (4): blkcg: allow blkcg_pol_mutex to be grabbed from cgroup [file] methods blkcg: blkcg_css_alloc() should grab blkcg_pol_mutex while iterating blkcg_policy[] blkcg: implement all_blkcgs list blkcg: fix blkcg_policy_data allocation bug block/bio-integrity.c | 4 +- block/blk-cgroup.c | 140 +++++++++++++++++++++++++------------------- block/blk-core.c | 2 +- block/blk-mq.c | 2 +- drivers/block/nvme-core.c | 13 +++- drivers/md/bcache/closure.h | 3 - drivers/md/bcache/io.c | 1 + drivers/md/bcache/journal.c | 2 + drivers/md/bcache/request.c | 14 ++++- include/linux/blk-cgroup.h | 11 +--- 10 files changed, 113 insertions(+), 79 deletions(-) -- Jens Axboe