Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750756AbdFNEbj (ORCPT ); Wed, 14 Jun 2017 00:31:39 -0400 Received: from mail-dm3nam03on0117.outbound.protection.outlook.com ([104.47.41.117]:45664 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750717AbdFNEbi (ORCPT ); Wed, 14 Jun 2017 00:31:38 -0400 From: Jork Loeser To: Vitaly Kuznetsov , Stephen Hemminger CC: Stephen Hemminger , Haiyang Zhang , "x86@kernel.org" , "linux-kernel@vger.kernel.org" , Steven Rostedt , Andy Shevchenko , "Ingo Molnar" , Andy Lutomirski , "H. Peter Anvin" , "devel@linuxdriverproject.org" , Thomas Gleixner , "Greg Kroah-Hartman" Subject: RE: [PATCH v8 07/10] hyper-v: globalize vp_index Thread-Topic: [PATCH v8 07/10] hyper-v: globalize vp_index Thread-Index: AQHS4SRN+/42AY8xeEWBL/mG2ZT7qqIjdVqAgAA2WE+AABrrcA== Date: Wed, 14 Jun 2017 04:31:32 +0000 Message-ID: References: <20170609132736.13699-1-vkuznets@redhat.com> <20170609132736.13699-8-vkuznets@redhat.com> <20170613162143.71ca0cc8@xeon-e3> <8760fzxpxb.fsf@vitty.brq.redhat.com> In-Reply-To: <8760fzxpxb.fsf@vitty.brq.redhat.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Enabled=True; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SiteId=72f988bf-86f1-41af-91ab-2d7cd011db47; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Ref=https://api.informationprotection.azure.com/api/72f988bf-86f1-41af-91ab-2d7cd011db47; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SetBy=jloeser@microsoft.com; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SetDate=2017-06-13T21:31:29.4380875-07:00; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Name=General; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Application=Microsoft Azure Information Protection; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Extended_MSFT_Method=Automatic; Sensitivity=General authentication-results: redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=none action=none header.from=microsoft.com; x-originating-ip: [50.125.164.6] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;CY4PR21MB0135;7:KO9uJRoXEkycaiGCrZT1DB+/+/fEwu7c9f9duCQ1FlWfPUHRIJWCl2jWSNc2GRrNTZANjPvhCWm7Rl+f0Bj1CzEiKCwEMGj9+NTJ4UWZIu1jS45JPMB2FG1kmJ4MgbIazQT6OawH7m/u8JRyOKlqVW8p32k5DQy32Y1iQ12e7xx11K69XdmCmpEw2mMY6q29yZPf8lqVM48Z19F0bJEArG3okT/pGNddJi7ZXiEijqMe0qtprozQwwLpFy0SNFcKo7vivK4V2cIdLfH3CItjErmFevtvvEgBF93bdg1T5Ww8R7CPPjDsSMwHc/rZ6DcJST1OGP28cX78qc7M9HpnBOsDxMcZdCvKXPgm68rYAxccAlFLxzc16fDlCao/RejoJR4xIXxSAYza2bZcO1bCiWzCP+FQYZX79ahkhIOjgHOYd81Az6SnMt7JqH7X6RL2lfGpbK00khRlNYICnPkWDuh8AHVATNXF8l7itN450Mm0mhL+LRzDe5Q4kepj614zItHVVabFXPhH/hpdRVotM3ldZVeFfOBTcVcNSU92qJ/LSiW161jO2L1n5jIodN+Ss2XtMA/7f0GcUuHkqTsIa6L8GpdJzP3wUjhsd9auhmal/vSyHYagzKKYZbKroRVbbYErMwAgczKjZWKv6KcKJv+q1W/PcCssb8aw9j1L49ku3idkUBWIi21Mtc6eZB1X43q+wogWymDrbFob/P7CN+AWucwawgFb3UiKkRbq6OmF1z6SEjg28xNLYSMHgp47+C7mM1a6e1VO/y9vC/DM6A0LHRHFgvdWrauCIaeWYnIu6v8ZbMXbSGgexcylG+fG x-forefront-antispam-report: SFV:SKI;SCL:-1SFV:NSPM;SFS:(10019020)(6009001)(39450400003)(39400400002)(39850400002)(39860400002)(39410400002)(39840400002)(24454002)(5005710100001)(8936002)(3280700002)(39060400002)(25786009)(3660700001)(66066001)(6436002)(3846002)(6506006)(2950100002)(86612001)(77096006)(8676002)(50986999)(76176999)(86362001)(81166006)(54906002)(33656002)(54356999)(9686003)(2906002)(102836003)(6116002)(4326008)(99286003)(7696004)(305945005)(55016002)(74316002)(7736002)(10290500003)(478600001)(10090500001)(93886004)(7416002)(229853002)(8990500004)(2900100001)(189998001)(5660300001)(53936002)(14454004)(122556002)(6246003)(38730400002)(72206003);DIR:OUT;SFP:1102;SCL:1;SRVR:CY4PR21MB0135;H:CY4PR21MB0631.namprd21.prod.outlook.com;FPR:;SPF:None;MLV:ovrnspm;PTR:InfoNoRecords;LANG:en; x-ms-office365-filtering-correlation-id: 5fae75c6-008b-4ed0-701e-08d4b2de3c5f x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(2017030254075)(48565401081)(201703131423075)(201703031133081)(201702281549075);SRVR:CY4PR21MB0135; x-ms-traffictypediagnostic: CY4PR21MB0135: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(61425038)(6040450)(601004)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(100000703101)(100105400095)(10201501046)(6055026)(61426038)(61427038)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123558100)(20161123562025)(20161123560025)(20161123555025)(6072148)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:CY4PR21MB0135;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:CY4PR21MB0135; x-forefront-prvs: 033857D0BD spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Jun 2017 04:31:32.9422 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR21MB0135 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 v5E4Vqbc018869 Content-Length: 1891 Lines: 42 > From: Vitaly Kuznetsov [mailto:vkuznets@redhat.com] > Sent: Tuesday, June 13, 2017 19:29 > > Stephen Hemminger writes: > > > On Fri, 9 Jun 2017 15:27:33 +0200 > > Vitaly Kuznetsov wrote: > > > >> To support implementing remote TLB flushing on Hyper-V with a > >> hypercall we need to make vp_index available outside of vmbus module. > >> Rename and globalize. > >> > >> Signed-off-by: Vitaly Kuznetsov > >> Reviewed-by: Andy Shevchenko > > > > This is correct, but needs to be rebased. > > It conflicts with the PCI protocol version 1.2 patches that are in the > > PCI tree. > > :-( > > The question is - what do we do? As far as I understand the intent was to push > this through Greg's char-misc tree. If I rebase it to Bjorn's pci tree patches won't > apply to char-misc and Greg won't take them. I see three possible ways to go: > 1) Take them into char-misc and resolve the conflict in merge window (Linus will > hate us all :-( ) > 2) Ask Greg to merge with Bjorn _now_ so we can send the rebased version. > 3) Postpone these patches to the next kernel release. No guarantee we won't > clash with something else :-( > > So I'm a bit lost. With Hyper-V drivers scattered across multiple trees we're > doomed to have such issues with every relatively big series. I would like to see Vitaly's patch-set being integrated shortly (option 1). In anticipation of this, the PCI protocol version 1.2 patches duplicate the CPU-ID/vCPU-ID mapping. The conflict thus is "just" a re-naming conflict - taking either old or new is fine (one occurrence of conflict). Is this acceptable for conflict management without instilling undue despise? That said, I am more than happy to help in the resolution. Also, once both changes are merged, I'll remove the duplicated logic. Regards, Jork