From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4680AC433DB for ; Tue, 16 Mar 2021 15:03:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 10E1265099 for ; Tue, 16 Mar 2021 15:03:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237672AbhCPPDD (ORCPT ); Tue, 16 Mar 2021 11:03:03 -0400 Received: from mx2.suse.de ([195.135.220.15]:49708 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237673AbhCPPC7 (ORCPT ); Tue, 16 Mar 2021 11:02:59 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id BC8E9AC75; Tue, 16 Mar 2021 15:02:57 +0000 (UTC) Date: Tue, 16 Mar 2021 16:02:54 +0100 From: Borislav Petkov To: Stephen Rothwell Cc: Wei Liu , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Juergen Gross , Linux Kernel Mailing List , Linux Next Mailing List , Michael Kelley Subject: Re: linux-next: manual merge of the hyperv tree with the tip tree Message-ID: <20210316150254.GC18822@zn.tnic> References: <20210315143505.35af617b@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20210315143505.35af617b@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Mon, Mar 15, 2021 at 02:35:05PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the hyperv tree got a conflict in: > > arch/x86/include/asm/mshyperv.h > > between commit: > > a0e2bf7cb700 ("x86/paravirt: Switch time pvops functions to use static_call()") > > from the tip tree and commit: > > eb3e1d370b4c ("clocksource/drivers/hyper-v: Handle sched_clock differences inline") > > from the hyperv tree. > > I fixed it up (I used the latter version of this file and then applied the > following patch) and can carry the fix as necessary. This is now fixed > as far as linux-next is concerned, but any non trivial conflicts should > be mentioned to your upstream maintainer when your tree is submitted for > merging. You may also want to consider cooperating with the maintainer > of the conflicting tree to minimise any particularly complex conflicts. Right, so tglx and I took a quick look and came to the conclusion that it would be best if you - provided it is not too much trouble - keep applying this patch so that linux-next can get tested properly and we - Wei or I - explain this merge conflict in our pull requests during the next merge window and ask Linus to merge your patch ontop. This way we'll save us the cross-tree merging dance. Thx! -- Regards/Gruss, Boris. SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg