Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935277AbcJUQJb (ORCPT ); Fri, 21 Oct 2016 12:09:31 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:43624 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S935043AbcJUQJ2 (ORCPT ); Fri, 21 Oct 2016 12:09:28 -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.9-rc Message-ID: <1b7e59a4-9558-801b-fe8f-0f7375d1c930@fb.com> Date: Fri, 21 Oct 2016 10:09:18 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [66.29.164.166] X-ClientProxiedBy: BY1PR18CA0025.namprd18.prod.outlook.com (10.162.126.35) To CY4PR15MB1189.namprd15.prod.outlook.com (10.172.177.11) X-MS-Office365-Filtering-Correlation-Id: 32a2063a-2a38-4810-e550-08d3f9cc9f81 X-Microsoft-Exchange-Diagnostics: 1;CY4PR15MB1189;2:6ItKKfbdJpbOBj3d7Hhh5wCuCsdw+WENbcKn5YN2BWZSwioH3bn3qBZDZ/MmuwMeDfqO15ULCSTZj4VSfVRuJNvVFk6MPshJpPUNhLqkJiF+2tS9qMWgctItDaGKpEt6NIc8rNLAaqiHC/kvybyRxDbGfnXqp3fJw7Kbwb+UGMVSY5/ftp1hge6xC5IomPaNe4kKIAthmAtiUidn7I2Z5w==;3:bAngSzDlFutQS+L0aeU25Jf09FChMf45wZ92g/J9jvEztzffrAN34wD4T28uzjIm++I7dF31ChJLJCFDHSlWmCPjWPRYWr2Y0aEIJmjUr2WhPhmexSShoixNMcEWG/CqJxzKqlHUbjLK//mQxPg1Jw==;25:99CWMi+ftrxN87V1R4naujPnNsmtm6QOKwmzKDErOCbJqqn+j7xgOwg012fuNSVfDMRba/CpqWVLhKQSo40b+qjgm3dYHSYjcCbW4xH9jH+4Q4SEG8spXYTZnGv8SSGw7M9NnIC4/eoXx57xA/Lt523xVnxyWrV669LMjNVpd89zOv0/DvYbZm6Tx0EWSxZdAw5QSbXDo1JoYrJeie1U9R3zeCTzebCrGlxcR8lkwmWMu8ecZUnHkI7li2Y9ZczhsHNVpqLgGNn/EN14zxpWwua3FbcJBL5yqFxM1ACLKp55MSiiFy6zP+yeF+XKVAT9i+LtvBCcimjYn445ZCfuYHQGni4UuPeIH7W2I69PbSYQpQs9e5VvoLgX5P3MjRpeoa1/DW6MUPYWae0SWwsIOzmDOyPV0k40yX0GT3stzRdER9xlmcsgSrg8UK/oY6JE X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY4PR15MB1189; X-Microsoft-Exchange-Diagnostics: 1;CY4PR15MB1189;31:HTwIjJp+rffhmhhg9iO5mr01vbfS0dR9ugh4VOcuEo9M/4BPNpHxJud49ywKVypwk6NXyVAO20Ar7nWqm9n32Cb8u5njiOxxcW17WRhtH7FXIi1fE4b5Jmed3WDZ/wFI7faUDVZPE9C7pIBBuwWy4q95LvbfMZ0SoD+ya7U8Yz6SInDTQMa/xmn5BgNrP/wbIw86xm5QPRecMP3tMjDmjAYWda9B3/zWmvGe8lnLtmWrpaTyh7bqFJvQOKWxNwiz;20:UIzMWNpCUK66zYRiI0rzS4ckCYErEQNSFzwmw+b8mHwo4+HR8zaL1Sski1evjlFvqJCfMNTPZJNDxF2MQPSXFyJSx28VjE+sVLXlQUcoT5Bu2wjrFKEWcBZVNJlir5NCyn04Oepi92qMvr4s1mwLCjrGtrWXbjLr+lXckGEZpks=;4:Dj1VL9G4YfXXRQUBjF1tLMz/MVkeMyX9cd3HOX5tGaD9dTQryEkVX8DDnvbBwUKeJI3fSzb+5TE/L9Skp4bAqyHD930/tV0vQBqjeCJ705eXqsQYiEI+iZK+adOzlnSp5Wjkkb/ve1EklKIuP+4Ygxq5u0HLBYD1b0f5rW8cha/HiqmDgW0hPFle0aqOam9ZOklfF0BtHU6gf7+z4ccr6ScBU/k3YCmh1K5V95tBKda18Ku7QskzjJUqqO/jD0Idy8idiiPuzgbRqDUImWjdhh8RoO0zSj0bdfKslMnDIQmTLszF9j4JfCXJEYg2fjcdTs8n5sQhvaVQaCRx6xBKVprjkP+IF8OlfNML+1ZiQMtqCITbOIDpclOJHDSXcWi29qeyDZXJ0Fls17TWp1GJ/Q== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040176)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046);SRVR:CY4PR15MB1189;BCL:0;PCL:0;RULEID:;SRVR:CY4PR15MB1189; X-Forefront-PRVS: 01026E1310 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6049001)(6009001)(7916002)(199003)(189002)(5660300001)(50466002)(50986999)(97736004)(23676002)(31696002)(4326007)(65956001)(77096005)(86362001)(65806001)(66066001)(7846002)(64126003)(189998001)(4001350100001)(586003)(19580395003)(6116002)(83506001)(2906002)(54356999)(3846002)(6666003)(101416001)(31686004)(47776003)(42186005)(117156001)(230700001)(6916009)(36756003)(81166006)(33646002)(65826007)(106356001)(7736002)(105586002)(81156014)(305945005)(92566002)(8676002)(229853001)(68736007)(110136003);DIR:OUT;SFP:1102;SCL:1;SRVR:CY4PR15MB1189;H:[192.168.1.176];FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtDWTRQUjE1TUIxMTg5OzIzOlVKZG4vZnRsMUsycW8rRnpiZVdwVnowenNQ?= =?utf-8?B?ZGw3MlRNd3lRd09KR0E2d1NFRndLdDBBSlgrd0pvQ3YwRGhXR0ZZSzh2M0pT?= =?utf-8?B?UFM3cXk4V2h4MEZiVFJvZWozS1g1YTNETFRWdHhSWkJ4ZGx0aGVvclF3VEds?= =?utf-8?B?a3hBeEJFK21YVU9LZmE4dlJ6U1ZHcmp6MEhkbThBV0k4S0xndGxyYVRqeEZi?= =?utf-8?B?SjdFdzJRWjViNzd1aGNPWGJ5TTAwODZSWXZIbyt0a2tiSTBVcG9JamdqU1Qy?= =?utf-8?B?QXNSaURUSGJVSnIwd2ErOTV1WTZCMTlwM3hsOVRqOCtCT2RidUE4VWlHSE1l?= =?utf-8?B?M2FjVUlHbXRQVUNhdlYzZXhjWWtjdCtFSU9EM3VKMzFlVTZZUGJGanIrQUFK?= =?utf-8?B?VE5GakNWaWtNN2ltWlovWlFBdXpmWDlJeEREdkNLNGxoNGVyN09Ka2ZNRzlZ?= =?utf-8?B?WFNuOWsvTm1DNzVLU3RsakxNbmlGME1kd1VSSjZHWWdPazA3WW9lV3BpV3Ew?= =?utf-8?B?UzVzRHhUc01Rbi9hOWdBbXhEQ0FXODh3V0NuMjlzTHJOUzRhZVg5Ym9EN3Nk?= =?utf-8?B?OFlCVU1EeUFXYWN6dXZWVkwxS0FyYWlLc0tyeUFHR2FQcmRrb1RQRzlhZndl?= =?utf-8?B?NkxxWi9zUDFFSytBRStPbHlVbUhSMVprVnBWMTVrcGtQVm5WTnRKeTFoQ2tz?= =?utf-8?B?WDJGK1ZpSXhDRGMzZWFjUWtvQkNvZ0hKdTh1YnZKaEp1SjJEcFRaWmIyeFpN?= =?utf-8?B?TitoOFlEanRvNUlzdlhnSldTZi83eEc4L0ptOXlydTZaZ0pRenl2eStrMVQ3?= =?utf-8?B?NHpPSEl3RDd5RWQyZGZTNXBqc0JvWTV1N2FiSTFWNzg5WXdyYmxKMUJ3NHkv?= =?utf-8?B?Q054WTdML2o0MUF5cTJxTms3Q01XVVRMS0E4QS9OaFFEeGtnK21DejRYeXQy?= =?utf-8?B?ZmJFVnV5SXh3aWpwK2kvTGE4K09vbFNWS3ZnU3FDYmk3dFhvZVJtSUJ5WEhH?= =?utf-8?B?SlNJTzh4MnFDRmZWaU1qL0IrbnhiQTdoYjVGL3B6dGNHZVhpNy9GVFZ5ZHN5?= =?utf-8?B?T0hDMlZ2TmdwTTZHSWZUL2d4d0hZc21uWVNsNTNtLzE0YXlvSW9ROS9mZEE2?= =?utf-8?B?S1k3Q2lkREs0VlpYeTdUVjNuVDRxWndQM2s1RjlEbEp5ekZiMHVCV3FLSFRK?= =?utf-8?B?Q1F1ekxoM3dlUXoyRHZoUFRVVUFuaGJJMlQzUlA3bngxNXJvNW05cWhlenVL?= =?utf-8?B?YWErcFFQSVlSOXB6Wklnd1pQYldYS0t4c0xqZkFLd2crUUEwc0Z4b2RSOWpp?= =?utf-8?B?YnNSRmY1dlA3a3NEY29mV24rUXc0K3RRUElzL2pCY1Rlb0ZDVFQ2VHo4Ulhm?= =?utf-8?B?UzhIdjJXaWNtTVJFaWpDNjYzSjMycitaZkw0d1FzOC9ieEU3VFJERDhQSlp1?= =?utf-8?B?eDlwSk5UNmZ5TDRNdkVBMkJVZVhFYkNyMTQ2eWhkRUQ4Y01XYmFPM0FIVTlw?= =?utf-8?B?Q1FxVmpHRDBSL2k5WE1EZHd3STNRQm5rRG1tZUZNOEFGMU02NXllZGl4QUdo?= =?utf-8?B?MDFNcnc4VHF2eFcySkNzaEFXMCtOSllEQnlFTUlqUkZyRjNjaGIyU0IzRjB0?= =?utf-8?B?S0wzRDNaMDl1Wk1uOENGTk96ZHE4U2FrNDFnVzY4a1BRT0dUdXprYVpPSkdm?= =?utf-8?Q?CzWzAXk7qjH5QKPpoU=3D?= X-Microsoft-Exchange-Diagnostics: 1;CY4PR15MB1189;6:8qan3bWGs+j4PzAFhyWwuUOVYhTXfe+ccq2Ba8nkYl/fmpzV0bnDdAjzP3v4Afa46nG+uPBHdaJJj2r43o5XDMJ6Gwlhc9MVZwggpGOE1mMiUPJwoeq4qG991aYdZ3guc1MgTgY0RTuv8im0jshwqaxHNR+DdMJb9Wxk5CqDSVJA7T/mP7dg3cKkhUd0U7PJf1sfLeMoI41Li165UqbortXSLV3uYPUN6sCof8pYYuC1AjnlkOuSuJ3z4LX1KscStFnWIfVKVsM0UeE5d7nP/6L9BVGNLby5vbyaMkPb07/1QJLeFaRTkEqXhJlTngs6;5:2rRLLti4St86skrrd70ZXYXAJDzDCBJGb/w4IPrlzd/TOfGs3s3Qhl9kvvS0duHCOWZGUvgVmBSAbh8Zzfmc6ElvRUNmAYRbw9CV4sNfAMwJ9REJfDN0ExXV6XqCLqyv2LPklryT7/WwRbBuAxHwt13nybnkHCQ75WBixDmGJi4=;24:CxL05joIKmJZ6SnxU4HQa0LW2f80N9ngMQag6HoEURLNb/e4ruybgvch+KC4xHYsZpwhhBq73+itACJZ+ZO3e8EnpkYiRu2ivXPFmPKy+7E=;7:7ZkPb1NAXLrWUo7TX39jf87zMj+cDxUPTsg1FgO1dwz+sYnKSqlo7q6oc5t1J2w5sQtny1HTOAAQlliiIOtjMguEiEPwTZfctT0idSQ61JPht6lbi3yoiltNUF4w82QLlHonHcEtMEgqPOQsdGY5SVXD2y2WMVVpBKpQDKEw+iGUoPaJrKmZLdaqdc1v14OxtnbDRFlXxpDef/OJ5uynLzWmtRI2Gol0Ml5yH1dDMYBIy2W4UXlYsnfsDyhZrhPhuG9c8XVciADnzMuLW3DYIiWV9oAp8dq/WMLV8fjAWStLjbKFjD71pO9bmO3Lsgm5KZT1CZnCFP7dTAZPZloQ8iWMtK7P7LzzxllDQXAj7IY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CY4PR15MB1189;20:CvU/92mtAGRDfiJva19PLLkMtMWgApqepGkFdaK2dnNTm5MDpIWkfQnE4dBkrNhdUUXhe6i1Jd4rYvfZ9EA7eJq+E3IrNiE5Az7l9cTbyNONGKWtjfZ3SE0w+o3vsNsbeLyJatszmVumOZie2UgAMwzWJyBllgyfeCrTGzmZbJE= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2016 16:09:23.0853 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR15MB1189 X-OriginatorOrg: fb.com X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-10-21_09:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1432 Lines: 47 Hi Linus, A set of fixes that missed the merge window, mostly due to me being away around that time. Nothing major here, a mix of nvme cleanups and fixes, and one fix for the badblocks handling. Please pull! git://git.kernel.dk/linux-block.git for-linus ---------------------------------------------------------------- Christoph Hellwig (5): nvme.h: resync with nvme-cli nvme.h: don't use uuid_be nvme.h: add an enum for cns values nvme: use symbolic constants for CNS values nvmet: use symbolic constants for CNS values Gabriel Krisman Bertazi (1): nvme: Add tertiary number to NVME_VS Keith Busch (3): nvme: Stop probing a removed device nvme: Delete created IO queues on reset nvme: don't schedule multiple resets Stephen Bates (1): nvme : Add sysfs entry for NVMe CMBs when appropriate Tomasz Majchrzak (1): badblocks: fix overlapping check for clearing block/badblocks.c | 6 ++-- drivers/nvme/host/core.c | 14 ++++---- drivers/nvme/host/pci.c | 77 +++++++++++++++++++++++++++++------------ drivers/nvme/host/scsi.c | 4 +-- drivers/nvme/target/admin-cmd.c | 8 ++--- drivers/nvme/target/core.c | 2 +- drivers/nvme/target/discovery.c | 4 +-- include/linux/nvme.h | 49 +++++++++++++++++++++----- 8 files changed, 115 insertions(+), 49 deletions(-) -- Jens Axboe