From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752121AbbBUUUV (ORCPT ); Sat, 21 Feb 2015 15:20:21 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:14397 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751982AbbBUUUR (ORCPT ); Sat, 21 Feb 2015 15:20:17 -0500 Date: Sat, 21 Feb 2015 12:20:10 -0800 From: Jens Axboe To: CC: Subject: [GIT PULL] Followup block pull request for 3.20-rc1 Message-ID: <20150221202010.GA8092@kernel.dk> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline X-Originating-IP: [192.168.57.29] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.13.68,1.0.33,0.0.0000 definitions=2015-02-21_02:2015-02-20,2015-02-21,1970-01-01 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 kscore.is_bulkscore=3.88578058618805e-16 kscore.compositescore=0 circleOfTrustscore=0 compositescore=0.985052395226116 suspectscore=3 recipient_domain_to_sender_totalscore=0 phishscore=0 bulkscore=0 kscore.is_spamscore=0 rbsscore=0.985052395226116 recipient_to_sender_totalscore=0 recipient_domain_to_sender_domain_totalscore=0 spamscore=0 recipient_to_sender_domain_totalscore=0 urlsuspectscore=0.985052395226116 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1402240000 definitions=main-1502210197 X-FB-Internal: deliver Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, Two things in this pull request: - A block throttle oops fix (marked for stable) from Thadeu. - The NVMe fixes/features queued up for 3.20, but merged later in the process. From Keith. We should have gotten this merged earlier, we're ironing out the kinks in the process. Will be ready for the initial pull next series. Please pull! git://git.kernel.dk/linux-block.git for-linus ---------------------------------------------------------------- Jens Axboe (1): Merge branch 'for-3.20' of git://git.infradead.org/users/kbusch/linux-nvme into for-linus Keith Busch (8): NVMe: Metadata format support NVMe: Update SCSI Inquiry VPD 83h translation NVMe: Register management handle under nvme class NVMe: Asynchronous controller probe NVMe: Fix potential corruption during shutdown NVMe: Fix scsi mode select llbaa setting NVMe: Remove unused variables NVMe: Fix potential corruption on sync commands Thadeu Lima de Souza Cascardo (1): blk-throttle: check stats_cpu before reading it from sysfs block/blk-throttle.c | 3 + drivers/block/nvme-core.c | 496 +++++++++++++++++++++++++++++++--------------- drivers/block/nvme-scsi.c | 96 +++++---- include/linux/nvme.h | 9 +- include/uapi/linux/nvme.h | 26 ++- 5 files changed, 417 insertions(+), 213 deletions(-) -- Jens Axboe