From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 A728F35BDAA for ; Thu, 12 Feb 2026 14:14:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770905701; cv=none; b=tiEdmaqAXWASR2IlQX0tZCYUBFsQfLDGPXPm8Lwn4lLQiSOzKUC/tHRCqz9R5ddBAdlLcpvFBDq0kt8DSML54PyAA4CviIxAChksk7l1g7ZOcKsVq3wB4XbgTtQ+ZoxdXHPMVD0kniwjOzZN/aJNDOkleW/pjBWK612IyO0cox0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770905701; c=relaxed/simple; bh=iUuLHefbY2t+oisBotVFZzXFiowEU5sk215/b1eNJtA=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=SIgfEpAECTrNHJ5y+azt0JvKvibFwpKPHmrX7DQWk9wdd17fV8ANrKtz4giZ2Mmyrl1Z3pbSw7PbqF2ojmTk8vRr8IJ7dti1NWhQn4aOa5vIP9QEaA68IrwEUwJTqH8dZuE4KAT1BnbpLQHZ0/KZL7nd6QuPiY3MIEcuaml+/bI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=iWt2pRO3; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=QjrwMimx; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="iWt2pRO3"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="QjrwMimx" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1770905694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oXfVCnaDM2RBdvtkMyyWRYu6V6AUtCSnxcxi171tkxs=; b=iWt2pRO31qFKWOHd0xMbTw4nMLaVayP8H1GSGMH42bnrZxdKwBCBX8/YjqTADeZJmeBTRw Djd8G7tr3uhgRDf6oL44v1TH+GFzbYqa7Cmn/oQR/RBlTmPRkjlRWh0AfpX/LOQoATXErV llzUHllLWilcBV6QBlEhK6O5eF8lfKk= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-449-iq8tzn-AOUC29NK8E8MkGA-1; Thu, 12 Feb 2026 09:14:51 -0500 X-MC-Unique: iq8tzn-AOUC29NK8E8MkGA-1 X-Mimecast-MFC-AGG-ID: iq8tzn-AOUC29NK8E8MkGA_1770905690 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-48079ae1001so63781875e9.0 for ; Thu, 12 Feb 2026 06:14:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1770905690; x=1771510490; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:content-language:from :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=oXfVCnaDM2RBdvtkMyyWRYu6V6AUtCSnxcxi171tkxs=; b=QjrwMimxKZOv5ICzIlWwg7xI5clWt+DbjF5UnMQMD+4OOywhk4IxjNM689meB869np iU1IMftsLN8Hd6RUBIRC8O+SrLumnlBLm0neQUuBk6uC51PBnI7UOowIr2kqqNAXftFY hC6hLZdOhozLusqFfRj+t5yheb8D4soJVc4r1D0pzk/GyOosiExW631wZRh7jFE7Mlqc xHxHl3eTC79AnIP06otMKLkYeqZ5iPghjfqZpvF/gZy7bvTXEe0vppGxC5SJnrAm+hXQ bIxy4gPYMRfSCocJFk7L1/Ckze4APxdY7Ry/NYH2Z2mwH0L9N3t++tMy0T8zgmrZ6z25 fwVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770905690; x=1771510490; h=content-transfer-encoding:in-reply-to:content-language:from :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=oXfVCnaDM2RBdvtkMyyWRYu6V6AUtCSnxcxi171tkxs=; b=ZmJMCbNMCDalZ6tleQ/V4PVufvnuQQXV46lOQYzGrcmu91+uMv52g6NWTZKQM5pQtd aYt8wli2IrDNsYHwpvaMAh9HiftFSKYmV6fYOWJsJu0zjw394ikSDvhEtkFaOGjDOB1O WTjXoEwMySBEZkKh0+lTEHGmICp1UAl8Y/7/d3T0wpR+6lqAi8fGEPWB+2IUwMbh5MA1 BSYydyMv8VZmVjnqQAVqIluf0jaf0qD13J4q+a1GW9K4mctHkBrBmKp/I9VYj1OVh1dn TDx0wbzYu7qYCWKUsZfdOmBOFghj25xkUTM1XLYssf5GzO/WWBkpXmR4h/PKBSNdkaUI c6Ow== X-Gm-Message-State: AOJu0Yw7RJC5R7RMZcWG3mottOpui78Zyq5ns+vVXSwJGFhwmdJsjyCU H0JqDPGE/OhS/blbwx4cN5ITodZAEjmSOpZZahrPC7SXE1PPurMsOTAKrBq1n4A941fPchdSgJS vVWbIsDSbTLoTInxdfDbWRx/hC9xvri0lKfrcjYGjP8qu+4IZtW1rmAydTMKqo3HofA== X-Gm-Gg: AZuq6aLvAU7jxPDFBJ03X3LHTVlaa3Nn0e2BHMKdiHU5yDelOPg5eKfTQ51+4Qg14nF Bbm9UuqYrUInd7/fgUyTaxMLbdnxMlIQeXoKh6pIK7tacbQCfRVBMTGT2Mi41IFCLnxGLSxJYQX Zun5tWfLpuZ0Urdy9Icna9jaPd1mOkxj7eg6nR51c54c0H+3xWPLGGKDfuO+bwxZpx5z29vdm8c f2f9FWY78ap3SeuKWiVdutZ32ZwLbAh7ZQTCdElT0PpDdtf+gueafi/b6AnZueN/VKeEOyA6Gdz 3bczOVgYYanUtaFBjC5D64m+8JWOn5VBKlz43RuRQHhQI7a5xgYJODFL3/ugLJVqvc4+c8zJY93 AxYrf7vKyqAZzsgTho0PgbhnnfNESoE2IJSMx2lF0Y62S1rJgReEKZMMCYrH9mOonZUg+h4X0p4 m/wcTAeR9CnJZua4ZO1q0EvOTm1Li37O62FwEZ80Ea9lCQR+PGhvA= X-Received: by 2002:a05:600c:8b2f:b0:46e:4586:57e4 with SMTP id 5b1f17b1804b1-4836570e519mr42505875e9.24.1770905690180; Thu, 12 Feb 2026 06:14:50 -0800 (PST) X-Received: by 2002:a05:600c:8b2f:b0:46e:4586:57e4 with SMTP id 5b1f17b1804b1-4836570e519mr42505435e9.24.1770905689729; Thu, 12 Feb 2026 06:14:49 -0800 (PST) Received: from [10.32.181.178] (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-4835dcfafcdsm197739675e9.9.2026.02.12.06.14.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 12 Feb 2026 06:14:49 -0800 (PST) Message-ID: Date: Thu, 12 Feb 2026 15:14:47 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: linux-next: manual merge of the kvm-x86 tree with the kvm tree To: Mark Brown , Sean Christopherson Cc: Linux Kernel Mailing List , Linux Next Mailing List References: From: Paolo Bonzini Content-Language: en-US In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2/12/26 15:08, Mark Brown wrote: > Hi all, > > Today's linux-next merge of the kvm-x86 tree got conflicts in: > > arch/x86/kvm/svm/svm.c > arch/x86/kvm/vmx/vmx.c > > between commit: > > 9e03b7caf4e65 ("Merge tag 'kvm-x86-misc-6.20' of https://github.com/kvm-x86/linux into HEAD") > > from the kvm tree and commit: > > f8ade833b733a ("KVM: x86: Explicitly configure supported XSS from {svm,vmx}_set_cpu_caps()") > > from the kvm-x86 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. Thanks, this is the tree that will go to Linus later today, so Sean will simply have to reset his tree to Linus's as usual. Paolo > diff --combined arch/x86/kvm/svm/svm.c > index 8f8bc863e2143,5f0136dbdde6b..0000000000000 > --- a/arch/x86/kvm/svm/svm.c > +++ b/arch/x86/kvm/svm/svm.c > @@@ -5389,6 -5389,7 +5389,6 @@@ static __init void svm_set_cpu_caps(voi > kvm_cpu_cap_clear(X86_FEATURE_MSR_IMM); > > kvm_setup_xss_caps(); > - > kvm_finalize_cpu_caps(); > } > > diff --combined arch/x86/kvm/vmx/vmx.c > index 967b58a8ab9d0,11bb4b9332274..0000000000000 > --- a/arch/x86/kvm/vmx/vmx.c > +++ b/arch/x86/kvm/vmx/vmx.c > @@@ -8247,6 -8247,7 +8247,6 @@@ static __init void vmx_set_cpu_caps(voi > } > > kvm_setup_xss_caps(); > - > kvm_finalize_cpu_caps(); > } >