From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 17AE72AE78 for ; Thu, 12 Feb 2026 15:21:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770909664; cv=none; b=aEtYNJk6h9RhAEtvyYXxo0G10Pf6rkNCuJpwZ21vuj45qbK9Xv8rCytuUzcpWmepAHjFBlWlyyKoDXhqzJZ8Bg41H02gvyGoiX47Bp6MiqMOBb/Nf+ngdoDqLt1qk4FB6q09mrfCxfGZoJUGOcEN4b9bvf/0EN65f6xuQyjENTY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770909664; c=relaxed/simple; bh=zQYMwoUuR9D4tz+mipTBZ8v7LNfQhGKkUErj4L7cs74=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=X7pCzBqgXyVkygnqzDWWLGk0vaBbwtovEJ1q/E4nL3rCZHgxBJameU3zxcgtYD5DJT8W9P6grJ492NXGK4heiBh10zb6SPlDzI2MuMLAAiyUGveYmIxBEuN8TnkX17/TI0NafpguF6RG4kQ2Dg/e4n9xysZUmETIHNbhL/tM27E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=w+gaxzT6; arc=none smtp.client-ip=209.85.214.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="w+gaxzT6" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2a946c0e441so34726935ad.1 for ; Thu, 12 Feb 2026 07:21:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1770909662; x=1771514462; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=oVrUsLQlAckaCNk2C4sj42DJVtIN4Um6DekJOAfydLA=; b=w+gaxzT6tob8eD7+RlIc5iXluPMNS1DRMXVjN+w1aaVnUBBvqtKWwxMniEG8+ZtNRE z/cBxX+ahJ30xsbQtY6xDIkoD33r79lPGfXe2n7zSgc0wE6a+ROIhKOpapft6vg8tIpV ymTzCf537k3QFDmomWVzHmr+pQlTpJ/TkWzQF5LxcGC3IcYqo078CMAq0uQVg9jr5Syq R2Sd9XIRyhSpToW2Xe+e8TF5l6XqbYI91FeyqSQMmWViWpkmi6bJzfWbiEqtsA/jyqQV Cfs9TpyMTvNolklsnyCNEqdoXvUtsNCSldVGVQSAXQPkuqC8WYnsLIXtWUGx5AysgFgk 0dkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770909662; x=1771514462; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=oVrUsLQlAckaCNk2C4sj42DJVtIN4Um6DekJOAfydLA=; b=cjuCNoxU0Qar/YDTWlckD4m0oMpFNeWKFAZds5E+lGie+gJ5SR+bpE3DoIlmkPkXCZ gOXBaVsthW/qjn4OFzDX03gNJ1aq0azsdcxFeoQ1ie0U2h+Fx24DXEAa/ceFFtn9vvR1 BA45lNy6qHNN4UlyBlFcalEk/7805WHwj/BoL0/HsPi+ky7ihkYBTfSOo/xvL64iSY2E r6E72mQXZT2PdmepjexOc7v70BeQ6L8H9j37TtfNKeaUJ6iFA400j3PkGJ2p/rTuqXV6 m+WZpTxirR2xa15eyNL1hm0evOmzBC+ZNrna126wdr0RkPfJ77ALk2wRmZ6U0/naDq/A ibjQ== X-Forwarded-Encrypted: i=1; AJvYcCVpCQaFiKw0P9n4zWFdrVjTXMOgEew/Y5wiWfLnnTL++MqWCwQ3FC3afgOzieGj4RD2i1BEjPVlpge1Khs=@vger.kernel.org X-Gm-Message-State: AOJu0YzHEj0P9ivBjJw82xHnyrYVkRN4kGez8W4og3XadOXg3w4uN3wE 5zjGYla7Us3rjNdxXf86UaovlstDK3HvH2NnZ7iADvPihfHQ4VhWnOAn3j3HjwNd6VdzmP4dIYp LO8WM8A== X-Received: from pgbdo14.prod.google.com ([2002:a05:6a02:e8e:b0:c63:59f0:d588]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:7103:b0:35d:d477:a7ea with SMTP id adf61e73a8af0-3944ce47727mr2698982637.19.1770909662322; Thu, 12 Feb 2026 07:21:02 -0800 (PST) Date: Thu, 12 Feb 2026 07:21:00 -0800 In-Reply-To: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: Message-ID: Subject: Re: linux-next: manual merge of the kvm-x86 tree with the kvm tree From: Sean Christopherson To: Paolo Bonzini Cc: Mark Brown , Linux Kernel Mailing List , Linux Next Mailing List Content-Type: text/plain; charset="us-ascii" On Thu, Feb 12, 2026, Paolo Bonzini wrote: > 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. Done (reset base to kvm/next).