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 C2ED3C433FE for ; Tue, 22 Feb 2022 19:46:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232424AbiBVTrL (ORCPT ); Tue, 22 Feb 2022 14:47:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229882AbiBVTrK (ORCPT ); Tue, 22 Feb 2022 14:47:10 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A5EB6D3AE; Tue, 22 Feb 2022 11:46:42 -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 8AD29B819BE; Tue, 22 Feb 2022 19:46:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1136CC340E8; Tue, 22 Feb 2022 19:46:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645559200; bh=AO+AwoLjIRy8xeREpj4ZerrCDKNDgw8iIzulz3f0Gyw=; h=From:To:Cc:Subject:Date:From; b=g6fxgOv90tpRhGjPfhOJs/JTZBa/+QIEeLpMkEFWanv2jkRLxbVoyjqjA77xswg5V 0CH0fFR0LbKcDh+U0sUefys7FQeG1Tw/Q2yvvCSw4FbjviGLzVqN9q5wU5d5ppt/PL Pvk/OkcgpZSPh2y4yN17yhNNMJlDgVHU6KQ1kIj5UcpyE2gkc8Uxk4UVrgRcdynJGR ild990vpM4vSnR0/BxfR8iwarS0xgpGM98LgaUTeZKw8i5zL1zVOEGMyk1rx/Lnpi2 TItqJI2gEZ6BsC+eR//hQ5+TaIAIGRkSEb8bfixSHCcO9p7w2UQwcmwbK3EVPMupjR Y+bzMvr8PjOyQ== From: broonie@kernel.org To: Paolo Bonzini , KVM Cc: Aaron Lewis , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the kvm tree with the kvm-fixes tree Date: Tue, 22 Feb 2022 19:46:35 +0000 Message-Id: <20220222194635.1892866-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/kvm/x86.c between commit: 127770ac0d043 ("KVM: x86: Add KVM_CAP_ENABLE_CAP to x86") from the kvm-fixes tree and commit: 8a2897853c53f ("KVM: x86: return 1 unconditionally for availability of KVM_CAP_VAPIC") from the kvm 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/x86/kvm/x86.c index 8a66d10c7a8dc,16d29d41908fa..0000000000000 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@@ -4245,7 -4235,7 +4247,8 @@@ int kvm_vm_ioctl_check_extension(struc case KVM_CAP_EXIT_ON_EMULATION_FAILURE: case KVM_CAP_VCPU_ATTRIBUTES: case KVM_CAP_SYS_ATTRIBUTES: + case KVM_CAP_ENABLE_CAP: + case KVM_CAP_VAPIC: r = 1; break; case KVM_CAP_EXIT_HYPERCALL: