Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934552AbdDGTvM (ORCPT ); Fri, 7 Apr 2017 15:51:12 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:47942 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933995AbdDGTvC (ORCPT ); Fri, 7 Apr 2017 15:51:02 -0400 X-IronPort-AV: E=Sophos;i="5.37,167,1488816000"; d="scan'208";a="111335238" From: Bart Van Assche To: "sfr@canb.auug.org.au" , "logang@deltatee.com" , "greg@kroah.com" , "martin.petersen@oracle.com" , "arnd@arndb.de" CC: "linux-scsi@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "ooo@electrozaur.com" , "openosd@gmail.com" , "linux-next@vger.kernel.org" Subject: Re: linux-next: manual merge of the scsi-mkp tree with the char-misc tree Thread-Topic: linux-next: manual merge of the scsi-mkp tree with the char-misc tree Thread-Index: AQHSr2CRHDmi4Qprs0GeARo0HqBDTKG6DkIAgAA9fgCAAAYKgA== Date: Fri, 7 Apr 2017 19:50:58 +0000 Message-ID: <1491594657.2559.24.camel@sandisk.com> References: <20170407153351.0ecafd59@canb.auug.org.au> <47b500d6-0700-812f-dda3-44a14014b66e@sandisk.com> In-Reply-To: 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-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [63.163.107.100] x-microsoft-exchange-diagnostics: 1;CY1PR0401MB1534;7:kRybILPLeI4AkbMlH9wyCJRuJGQ5EqauFNeAnyECDrSY2J/wZBVFOKjjODdAMZ1dWr0pSrwmDNfaGUnnDqGkWtnlQHeaMSmISH5+RW994xmZqZNEqcOoKWrea3DafKYpFvDRRu4D/X3dxc6mqqst3kdoCzIZKc9QeA9+XtZsCe+R4eZrDC3+p0pmlul7AdL3OSxi8Lyq0/VYQkTz4cKixo2ovyFBruc3wLTI5gBwrJF7DIHYjvo8IAKcuVYgfAgIH3j32/Vj+P8yBK9JBJJ3ttfTIHnmQqWEXSn5+b5BPUBrq23So6dCW5zZpDYNZ9bOjZLXeXfi3YK2pWLGikN8kw==;20:wPDcYlN9MRyrIfPbPgfVvd3+wVIiiWHnklDZh+aoY+V3xLby5l3MwJov/Akt5WeND9tXxTBVsnbBaGynX4Gkyhtn+Kbj7YUbOgvh1oM5q8TvIHj82KcSsUjo9MPF9+KrCgadm4TXpIxBnLP3IkrGdKrwHEpa9sSVbUp46n6IOo0= x-ms-office365-filtering-correlation-id: f0375842-ec99-435b-d488-08d47def6980 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(2017030254075)(48565401081)(201703131423075)(201703031133081);SRVR:CY1PR0401MB1534; 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)(10201501046)(3002001)(6055026)(6041248)(20161123562025)(20161123555025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(20161123560025)(6072148);SRVR:CY1PR0401MB1534;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0401MB1534; x-forefront-prvs: 0270ED2845 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(6009001)(39400400002)(39410400002)(39850400002)(39450400003)(39840400002)(39860400002)(377454003)(377424004)(24454002)(39060400002)(2950100002)(2906002)(189998001)(38730400002)(6246003)(103116003)(122556002)(76176999)(50986999)(54356999)(6486002)(77096006)(66066001)(4326008)(8936002)(7736002)(305945005)(3660700001)(81166006)(7416002)(8676002)(3280700002)(5660300001)(2501003)(86362001)(6512007)(25786009)(33646002)(99286003)(54906002)(53546009)(6436002)(102836003)(3846002)(6116002)(36756003)(53936002)(2900100001)(6506006)(2201001)(229853002);DIR:OUT;SFP:1102;SCL:1;SRVR:CY1PR0401MB1534;H:CY1PR0401MB1536.namprd04.prod.outlook.com;FPR:;SPF:None;MLV:ovrnspm;PTR:InfoNoRecords;LANG:en; spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-ID: <830232C872956D4280080F23832D69D7@namprd04.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Apr 2017 19:50:58.5070 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0401MB1534 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 v37JpNeW016766 Content-Length: 832 Lines: 19 On Fri, 2017-04-07 at 13:29 -0600, Logan Gunthorpe wrote: > On 07/04/17 09:49 AM, Bart Van Assche wrote: > > Sorry that I had not yet noticed Logan's patch series. Should my two > > patches that conflict with Logan's patch series be dropped and reworked > > after Logan's patches are upstream? > > Yeah, Greg took my patchset around a few maintainers relatively quickly. > This is the second conflict, so sorry about that. Looks like the easiest > thing would be to just base your change off of mine. It doesn't look too > difficult. If you can do it before my patch hits upstream, I'd > appreciate some testing and/or review as no one from the scsi side > responded and that particular patch was a bit more involved than I would > have liked. Boaz, had you noticed Logan's osd patch? If not, can you have a look? Thanks, Bart.