From patchwork Thu Dec 1 00:57:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13060866 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 50117C47088 for ; Thu, 1 Dec 2022 00:57:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229701AbiLAA5u (ORCPT ); Wed, 30 Nov 2022 19:57:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229449AbiLAA5s (ORCPT ); Wed, 30 Nov 2022 19:57:48 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 47BB81FF92; Wed, 30 Nov 2022 16:57:45 -0800 (PST) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4NMyNR1pd4z4xFv; Thu, 1 Dec 2022 11:57:42 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1669856263; bh=KXADFIMMmWG2dsbS7Re7sU/J+anY0jo/1Wlp2ldlTZc=; h=Date:From:To:Cc:Subject:From; b=KVJvCMdGO5y7GtEiY1nOHvbSM+gWYnpNyZ7RxSbYb1dv8F17zI4VYD7/PL+rsqCUt eL3iloa6dUkGSJA1lTxG2h6sNU2qIDHMDBqMRpICCSgETZ2e3yZOUnsNiuI4CSDMqU 230fEzKC1FUYfEVi5tm7UIMhMHqCVCAJsNaz+GC/ZtJlpjm4pY2KMMSQ5qz1lLr2qB zTt1PQzhZr15ryCTjHIy/r3IsY/AvQ53B9KH4PyVobjRiPIkklS0TGXuTOFuPSn0Gu 5pT8JjbzdjYgSA6SYsHfDuMPPzquJtbjjfkawrx2iykVH8Z/RY0BfHTfYihAMLdq9v qBtpHP4P+uMaw== Date: Thu, 1 Dec 2022 11:57:41 +1100 From: Stephen Rothwell To: Christoffer Dall , Marc Zyngier , Paolo Bonzini Cc: KVM , David Matlack , Linux Kernel Mailing List , Linux Next Mailing List , Oliver Upton , Sean Christopherson Subject: linux-next: manual merge of the kvm-arm tree with the kvm tree Message-ID: <20221201115741.7de32422@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Hi all, Today's linux-next merge of the kvm-arm tree got conflicts in: tools/testing/selftests/kvm/access_tracking_perf_test.c tools/testing/selftests/kvm/memslot_modification_stress_test.c between commit: 7812d80c0f89 ("KVM: selftests: Rename perf_test_util symbols to memstress") 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 (see below) 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. diff --cc tools/testing/selftests/kvm/access_tracking_perf_test.c index 02d3587cab0a,942370d57392..000000000000 --- a/tools/testing/selftests/kvm/access_tracking_perf_test.c diff --cc tools/testing/selftests/kvm/memslot_modification_stress_test.c index d07e921bfcc5,3a5e4518307c..000000000000 --- a/tools/testing/selftests/kvm/memslot_modification_stress_test.c