From patchwork Mon Apr 14 04:14:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 14049697 Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 951ABF9FE; Mon, 14 Apr 2025 04:14:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744604064; cv=none; b=Yd74YKoK5CGIX5l568sDcgxdec9s4zE3NxsF96E+myXKQHm+ZJzVrJgkGiFzALhQdW79F/pUB0PJYUvwRvNOKqZ+FxPVY/UWgs507cO9Tha2Lc3lYOklOzvdYxq56GzwJxkgTaul3Ylhr7sOSbpwIqX7LsD8peQ4smRsbKnn2EY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744604064; c=relaxed/simple; bh=9ycSAGCn/N7lHXI00aJ49NEF/zfU6sodzqjJrT6h6Lw=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=bR4lmZshICPcDSMZw1ut0S3c/XOtXzGjmhbqDzELlJqq2JGoxrdSTmb/bPJNPT9l5Pqs+/bVzWUO0OjRakoD4Cj8j0TtU06cXppGrz46voYWTg1SVcpM7fB7Lws8XQl2P7WZ0Xi1vNp6H7MlZbBwz0jc936xNcEdorPoT88Jn5o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=HN6IPRCX; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="HN6IPRCX" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=202503; t=1744604054; bh=+W04DPVRK/5aBuiIFsxv0Q9xp/bifT9N7ci3BNtR8oQ=; h=Date:From:To:Cc:Subject:From; b=HN6IPRCX9Q+zAxm9iIgtg+x3BldQum1YUaay2DEmtrB88goNETQck4100TT25o6ZL H7JPBoiPARz/7+8KjvlrnPtfyGtvK9N4q15U/1o4dDGOfymDrHpv+fh6THaNsI370Z 3AfPotLKZ3FUGsyAIqCl+p77AL3w4hfJM95uBQCnsGTNDeOrmsFNEycA3KPtA1H66d DQ3Fsg9YW+KLAyL4ErCz6RWtqaCOMIKsxhzROv6HvulzJ9BE8XqwT6AUop0eielSm6 IXFJ71RCJzolFbJSSFaYFmcy+5qYrJP2g/aAEpn5vhCt6mxMZOy99lc4cahjVmPN8Z IYJ7Lp0wCoVAw== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4ZbYnw1YcMz4wbr; Mon, 14 Apr 2025 14:14:12 +1000 (AEST) Date: Mon, 14 Apr 2025 14:14:11 +1000 From: Stephen Rothwell To: Paolo Bonzini , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: Adrian Hunter , Binbin Wu , Ingo Molnar , KVM , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the kvm tree with the tip tree Message-ID: <20250414141411.469e897f@canb.auug.org.au> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/kvm/vmx/vmx.c between commits: c435e608cf59 ("x86/msr: Rename 'rdmsrl()' to 'rdmsrq()'") 78255eb23973 ("x86/msr: Rename 'wrmsrl()' to 'wrmsrq()'") from the tip tree and commit: 7172c753c26a ("KVM: VMX: Move common fields of struct vcpu_{vmx,tdx} to a struct") 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/vmx/vmx.c index cd0d6c1fcf9c,ef2d7208dd20..000000000000 --- a/arch/x86/kvm/vmx/vmx.c