Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755450AbdDLRo5 (ORCPT ); Wed, 12 Apr 2017 13:44:57 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:19994 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752369AbdDLRos (ORCPT ); Wed, 12 Apr 2017 13:44:48 -0400 X-IronPort-AV: E=Sophos;i="5.37,191,1488816000"; d="scan'208";a="112468404" From: Bart Van Assche To: "martin.petersen@oracle.com" CC: "sfr@canb.auug.org.au" , "linux-kernel@vger.kernel.org" , "logang@deltatee.com" , "linux-scsi@vger.kernel.org" , "greg@kroah.com" , "arnd@arndb.de" , "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: AQHSr2CRHDmi4Qprs0GeARo0HqBDTKG6DkIAgAbjjheAARhSgA== Date: Wed, 12 Apr 2017 17:44:34 +0000 Message-ID: <1492019073.2764.7.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: oracle.com; dkim=none (message not signed) header.d=none;oracle.com; 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;CY1PR0401MB1533;7:u16oOES60kyXlDjcEIdG2nPwjM7xGoviKUkk3LfUuBsY27jbhdqkR3cOxI/EjYt8kEhWnOu6m9D5FwFeLzHXMZMZosu9DuL0I1B5ADM1imPB3lC8T6YqPJAzSD48plqv2QeB/mAO9huWJBbk6412QOV0PIho1gbv0ItJP3V6ZDNJ8Rb2m2ipIZpN+ETUqPOOOuxUxdXO/ypgHgsEr1d021fJVKf0xJttqpvGmjV5lUOV1KkC+d//f+hq6SEeyKNtDMtWZz25yRO7lhZ8M4BGWI/xMJ3FDxJRGGHsQt5zUKUdZSDlhdn8tzEtviQNMiFSOPr4T41Qn58olO7dZBjopQ==;20:iV5+0CGLzAk/tcWoCNNo0LxjojRMHbYItoWCP4/oHUvLQbc/TxBy0nLpC7eDkESayn6Dc2IiEhvaXx/9ciM38Qc65r1uVPEMtYj+gZPcCflXmWa2Fz/qSlyV9qalYfKiJAoauDYd5TjhmN/j8Pw+5qWvubIgqWn6Lsxb20CwiAE= x-ms-office365-filtering-correlation-id: 1e5ad58c-1307-4c34-2d9b-08d481cb9571 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(2017030254075)(48565401081)(201703131423075)(201703031133081);SRVR:CY1PR0401MB1533; wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(84791874153150)(42932892334569); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041248)(20161123564025)(20161123560025)(20161123555025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(6072148);SRVR:CY1PR0401MB1533;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0401MB1533; x-forefront-prvs: 027578BB13 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(6009001)(39400400002)(39860400002)(39840400002)(39850400002)(39450400003)(39410400002)(24454002)(45074003)(377424004)(2906002)(3660700001)(6246003)(3280700002)(25786009)(66066001)(6916009)(2501003)(99286003)(54356999)(54906002)(2950100002)(86362001)(229853002)(6512007)(76176999)(50986999)(6306002)(6436002)(6486002)(6506006)(5640700003)(110136004)(38730400002)(189998001)(4326008)(77096006)(53936002)(6116002)(122556002)(305945005)(8936002)(8676002)(5660300001)(7736002)(81166006)(102836003)(3846002)(103116003)(2351001)(33646002)(36756003)(2900100001);DIR:OUT;SFP:1102;SCL:1;SRVR:CY1PR0401MB1533;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: <3609D2254566B6469993A59481755BB5@namprd04.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Apr 2017 17:44:34.9547 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0401MB1533 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 v3CHjKuX008220 Content-Length: 730 Lines: 17 On Tue, 2017-04-11 at 21:00 -0400, Martin K. Petersen wrote: > Bart Van Assche writes: > > 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? > > Obviously things break the minute you go on vacation. I'm back > now. What's the current status? Hello Martin, Logan's patch series has been queued by Greg KH for kernel 4.12. So Linus will have to resolve the merge conflict between Greg's char-misc tree and the SCSI tree during the 4.12 merge window. See also https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git/log/?h=char-misc-next&ofs=250 Bart.