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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2F17EC43217 for ; Thu, 1 Dec 2022 15:23:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230081AbiLAPXR (ORCPT ); Thu, 1 Dec 2022 10:23:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230527AbiLAPXN (ORCPT ); Thu, 1 Dec 2022 10:23:13 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CEEA95AE2A; Thu, 1 Dec 2022 07:23:12 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 8B8BBB81F0A; Thu, 1 Dec 2022 15:23:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3D18AC433C1; Thu, 1 Dec 2022 15:23:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1669908190; bh=hdPK4C9u+b86XHyE+7GXEreLjX9Vd58RIXLhIVDS6l4=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=PVY8A42NvyiQ21O91ajwdUW1/BiFDQs+cStEeMLZ37S4fKiItWTexJp0Jnjp8mJhD m5NxvqdVX9r2s3FALR1PgSqBP7ECWpc44uTIkPmnKbRDKIcqYIYbXTx9z3yZUPkVfO ulDRNP+KLxLlNlBV6K7QBIcr2d5sFT5YAx7PtsSUgnwL/80xg0IY7bOk9eNvlMAUSR 62HocJDMnzfiJg4ZQ02aIChkdCPdlDZbeKJvtbPmJIS/+1FNHfMZMb/fpErze8hUXi K/1FKknabUcvooQxwQBUfosdysHD2HADQsgev67351QhEqSbzfHLgZVOaoFukvSUg0 47kX9JRmjBvmg== Received: from sofa.misterjones.org ([185.219.108.64] helo=goblin-girl.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1p0lP1-009rGS-Uv; Thu, 01 Dec 2022 15:23:08 +0000 Date: Thu, 01 Dec 2022 15:23:07 +0000 Message-ID: <865yevm9lw.wl-maz@kernel.org> From: Marc Zyngier To: Paolo Bonzini , Stephen Rothwell Cc: KVM , David Matlack , Linux Kernel Mailing List , Linux Next Mailing List , Oliver Upton , Sean Christopherson Subject: Re: linux-next: manual merge of the kvm-arm tree with the kvm tree In-Reply-To: <20221201131623.18ebc8d8@canb.auug.org.au> References: <20221201131623.18ebc8d8@canb.auug.org.au> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/27.1 (aarch64-unknown-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: pbonzini@redhat.com, sfr@canb.auug.org.au, kvm@vger.kernel.org, dmatlack@google.com, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org, oliver.upton@linux.dev, seanjc@google.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Thu, 01 Dec 2022 02:16:23 +0000, Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the kvm-arm tree got a conflict in: > > tools/testing/selftests/kvm/include/perf_test_util.h > > between commit: > > 9fda6753c9dd ("KVM: selftests: Rename perf_test_util.[ch] to memstress.[ch]") > > from the kvm tree and commit: > > 9ec1eb1bccee ("KVM: selftests: Have perf_test_util signal when to stop vCPUs") > > from the kvm-arm tree. > > I fixed it up (I removed the file and 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. > > (this patch covered another occurrence fo the needed rename) Huh, this is a lot of conflicts. Paolo, do you have a stable branch I can pull in my tree to kill those? Or do you want to deal with the conflicts yourself? M. -- Without deviation from the norm, progress is not possible.