From patchwork Thu Apr 6 03:06:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 80044 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp741349vqo; Wed, 5 Apr 2023 20:19:15 -0700 (PDT) X-Google-Smtp-Source: AKy350YxAgM1/I4j6T0rwKkC6E/2IxNmereadhMrPInbvw9QSFBqdBlwBq23louagDXwyecAOeVK X-Received: by 2002:a17:90b:3b87:b0:23b:2ce5:2ddb with SMTP id pc7-20020a17090b3b8700b0023b2ce52ddbmr4831679pjb.8.1680751154927; Wed, 05 Apr 2023 20:19:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680751154; cv=none; d=google.com; s=arc-20160816; b=DOoQe40I59koq51a6dLZlZB2RlYJYR0bqLLyFVrY4YJKSTlauNNEP0cPged0YS20ft uFX3JLs8y9PLuecd0m16AAmj8Dp39OKSEBrqES0o39ZP/nZfgYIrxVqv5yL7FrNJ3ttj lDQYYMmSih0s4SE2GNLT54tvDpFyfLazxP66QBybfK4Kjxg5HkE5JeX+Pk7yyitMzogN LYm6mg/3WbfumVDnuZIDIw82Hobw+NtNU0OzHrwqrDxY+ArA7kLd8z7dvlKzl/waE8sa yEZOFiY5RCy2BXIfFlNbC3iMT+LASmoC76aoz7aAlnmwB+iAA06DcL0EA3qvoLMMgl+n D9Rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=+7JnYdXl4iRYhR/fNbCL6DbEPldREXhma/t+L8lv3Js=; b=cGv98mHVfFG0P5LK4wvU7249iJHhVI9Ez0PIKd3bm0ymEUum64cQsfgCsXnGe9JKsR 3ZVUbvPR6Mzs+yRJsMKghKaUTTTM0XOmAdx5hQmxOH/lynBq5bG0dUQM4zBDTJOUYpFW Iz4KhWxURKNS92BSDhW4RMjkT34M0UG8amh2mIjZGCxk8nvzy/Bfjb3JwAXkbjf3nB2A Fv8V9s/cYWti7Qt2Anjq+RS4JOoout0ygt8+9ANPq832sitaXu2lJ6n0lzxOYSnID+ST FhcH2vCGNXYVnSrTLTEZiyvWDAFUfPiEGKdE2huB7alDsthGo94gXaN6Krrse22n3v23 mtyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=nx9WwZzD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m3-20020a170902bb8300b001a20296932fsi519912pls.538.2023.04.05.20.19.03; Wed, 05 Apr 2023 20:19:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=nx9WwZzD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235211AbjDFDHQ (ORCPT + 99 others); Wed, 5 Apr 2023 23:07:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235393AbjDFDG0 (ORCPT ); Wed, 5 Apr 2023 23:06:26 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA5BBAD04; Wed, 5 Apr 2023 20:06:11 -0700 (PDT) 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 4PsRGP20nxz4wgv; Thu, 6 Apr 2023 13:06:04 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1680750365; bh=+7JnYdXl4iRYhR/fNbCL6DbEPldREXhma/t+L8lv3Js=; h=Date:From:To:Cc:Subject:From; b=nx9WwZzDcwf8f02O4B1Eo+3/kc7fR4+ptzZdOyJ0xWtJ2BN1fMxGw/Oq14JTz6CaE L8Q7Etru1Qc+P+W6khw3YznWVtBDi0bppM8Bct2Hzl1BjBkhKJhNzHDTHpcm5t+kpD qRUSW9YHeah0KwYMJaYdSj9WJJBiiSya6raaBfjKzFRgNQ6qkjfj/mVzZEI8k/fL/p gxwttRbW7wq+tw5Oy2jR9SPLVS+dLpnvNTnQVlZ/+B7oiaQ60s6OYQueQg+9+78mPm 5+Y7pKPewP4FUIRXc/ND8Pv9RYjAtkPxOUqzvU3/eTgyvXceujVFlrXQ13FD6uMtMC LldLzWDgaMU+Q== Date: Thu, 6 Apr 2023 13:06:03 +1000 From: Stephen Rothwell To: Christoffer Dall , Marc Zyngier , Paolo Bonzini Cc: KVM , Linux Kernel Mailing List , Linux Next Mailing List , Oliver Upton , Thomas Huth Subject: linux-next: manual merge of the kvm-arm tree with the kvm tree Message-ID: <20230406130603.273997ca@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762395323052578739?= X-GMAIL-MSGID: =?utf-8?q?1762395323052578739?= Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in: arch/arm64/kvm/arm.c between commit: d8708b80fa0e ("KVM: Change return type of kvm_arch_vm_ioctl() to "int"") from the kvm tree and commit: e0fc6b21616d ("KVM: arm64: Add vm fd device attribute accessors") 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 arch/arm64/kvm/arm.c index aaa752be3776,4ec888fdd4f7..000000000000 --- a/arch/arm64/kvm/arm.c