From patchwork Thu Dec 1 01:09:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13060880 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 37FCBC47088 for ; Thu, 1 Dec 2022 01:09:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229693AbiLABJp (ORCPT ); Wed, 30 Nov 2022 20:09:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229566AbiLABJo (ORCPT ); Wed, 30 Nov 2022 20:09:44 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 905D942F7B; Wed, 30 Nov 2022 17:09:42 -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 4NMyfD5F24z4xFv; Thu, 1 Dec 2022 12:09:40 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1669856981; bh=brvavOSOc62js08CKp3eQxixTiCVzmBixPUmp8sxcW8=; h=Date:From:To:Cc:Subject:From; b=AAjY4PhM/3tjlWzLFpEF1CVHxtrnPlvH4pXdCV5tiOKOblqlcs+XvkDhJk3DI85qp yjZDxpLjtKHfqgcUOvsJhnZCuRKbV76/2Q6skzSTlb9Tp0np3jO95gHcjrJCeHyXja voC+0YjKnVMAwVhAOHPfgdY+knE6+1+wT5+JnTL7HkGDKu5WF0Yp4pxxPVEM+vkXfw p1zwvMBmWT+BTv+kCr5hDUICis7a96E8Prba5lbhmU/PvBgZWYtcP3HlG6iIgu8CeQ FC/kaU+6u2nzZpNhuOol+VOkUU/uph1dQz1DzZgkxvqEcNqOxC8N68NnhmeSbf1i/e ZatCSvrstGlrQ== Date: Thu, 1 Dec 2022 12:09:39 +1100 From: Stephen Rothwell To: Christoffer Dall , Marc Zyngier Cc: Gavin Shan , Paolo Bonzini , KVM , Linux Kernel Mailing List , Linux Next Mailing List , Sean Christopherson , Vipin Sharma , Vishal Annapurve Subject: linux-next: manual merge of the kvm-arm tree with the kvm tree Message-ID: <20221201120939.3c19f004@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 a conflict in: tools/testing/selftests/kvm/memslot_perf_test.c between commits: 018ea2d71a43 ("KVM: selftests: Add atoi_paranoid() to catch errors missed by atoi()") dc88244bf548 ("KVM: selftests: Automatically do init_ucall() for non-barebones VMs") 197ebb713ad0 ("KVM: selftests: move common startup logic to kvm_util.c") from the kvm tree and commits: 34396437b11f ("KVM: selftests: memslot_perf_test: Probe memory slots for once") 8675c6f22698 ("KVM: selftests: memslot_perf_test: Support variable guest page size") a69170c65acd ("KVM: selftests: memslot_perf_test: Report optimal memory slots") 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/memslot_perf_test.c index 36b20abfb948,2ad40f7c9c08..000000000000 --- a/tools/testing/selftests/kvm/memslot_perf_test.c