Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S968719AbdDSRqu (ORCPT ); Wed, 19 Apr 2017 13:46:50 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:42792 "EHLO esa4.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S968586AbdDSRqq (ORCPT ); Wed, 19 Apr 2017 13:46:46 -0400 X-IronPort-AV: E=Sophos;i="5.37,222,1488816000"; d="scan'208";a="12294729" From: Bart Van Assche To: "sfr@canb.auug.org.au" , "arnd@arndb.de" CC: "jejb@linux.vnet.ibm.com" , "linux-scsi@vger.kernel.org" , "ooo@electrozaur.com" , "dan.carpenter@oracle.com" , "linux-kernel@vger.kernel.org" , "bhalevy@primarydata.com" , "martin.petersen@oracle.com" Subject: Re: [PATCH] scsi: osd_uld: fix mismerge Thread-Topic: [PATCH] scsi: osd_uld: fix mismerge Thread-Index: AQHSuTSTQGnECYoAIkCJGU6zTZ80wKHM92SA Date: Wed, 19 Apr 2017 17:46:43 +0000 Message-ID: <1492624001.2543.9.camel@sandisk.com> References: <20170419174415.4029467-1-arnd@arndb.de> In-Reply-To: <20170419174415.4029467-1-arnd@arndb.de> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: canb.auug.org.au; dkim=none (message not signed) header.d=none;canb.auug.org.au; dmarc=none action=none header.from=sandisk.com; x-originating-ip: [63.163.107.100] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;CY1PR0401MB1536;7:3xOTAqTkqyUYQo10A5yk4hW/KaySjcBfrXgg9uifsY42nHLcWJ+UClB748ABBxLJy69Pyb3m2PFAaiVY21/bKd5x1YtHLF5VmeOrgP80v8jeHRyrShrwiI2QBKWpZDl64FdJrBDYC0nvS+e9b3eoBiJDcM+g8s8TCdohBpmcns6KEP9eFWIBIvU/a2FrxmZPosWUBqzw3ULy9KipuikbSdmthKXje5EHVxXjEiBqdnQGrCcR0aesuuwBcNE52yMkfABQgA4QDfrmAiUmiTaG58/vE5gsuL6y4MKzW9pI1Y6GuarkmUXL4Keil1qz/q0BDfgvFUOXDF95c2yRYk2ERQ==;20:TzN9JsVJGZ/KjWVyX6/2ZdbWnJ5cQ2KbIeUaoKYRso4WNY2pauX0y/vXB/k4qH3y9i8QaWay3uandAmz5XiKA+kzJKm2wK+wI/cXUN+3e9KiCtpTq1KwM8+XKt5KvFLf028VMB6WVnXpY/Ad/YWzDXPzwR/srJ55czhI+ygkzZo= x-ms-office365-filtering-correlation-id: bae1cbb1-0a56-4659-a2e7-08d4874c0aba x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(2017030254075)(48565401081)(201703131423075)(201703031133081);SRVR:CY1PR0401MB1536; wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(6055026)(6041248)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(20161123560025)(20161123555025)(20161123564025)(6072148);SRVR:CY1PR0401MB1536;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0401MB1536; x-forefront-prvs: 028256169F x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(6009001)(39840400002)(39450400003)(39860400002)(39850400002)(39410400002)(39400400002)(24454002)(377424004)(54356999)(6486002)(77096006)(50986999)(76176999)(5660300001)(6506006)(6436002)(305945005)(2950100002)(102836003)(4326008)(6116002)(3846002)(2501003)(25786009)(189998001)(36756003)(229853002)(66066001)(6512007)(103116003)(2900100001)(6246003)(99286003)(86362001)(54906002)(38730400002)(53936002)(3280700002)(122556002)(33646002)(2906002)(3660700001)(81166006)(8676002)(8936002);DIR:OUT;SFP:1102;SCL:1;SRVR:CY1PR0401MB1536;H:CY1PR0401MB1536.namprd04.prod.outlook.com;FPR:;SPF:None;MLV:sfv;LANG:en; spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-ID: <800C66E32CD2FE4C9ECE44BFF6EAE634@namprd04.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Apr 2017 17:46:43.1198 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0401MB1536 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by mail.home.local id v3JHkr7h006320 Content-Length: 382 Lines: 11 On Wed, 2017-04-19 at 19:44 +0200, Arnd Bergmann wrote: > Fixes: c02465fa13b6 ("scsi: osd_uld: Check scsi_device_get() return value") > Fixes: ac1ddc584e98 ("scsi: utilize new cdev_device_add helper function") Hello Arnd, Both these patches are fine as far as I can tell. Shouldn't the "Fixes" tag refer to the merge commit instead of to the commits that have been merged? Bart.