From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) (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 2CC843F99E3 for ; Tue, 25 Aug 2026 14:27:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.199 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787668024; cv=none; b=Rslpxmz6frag9a9+y9a4/oDAMbjt3W/HGhNcWyiovbH1voPVIs89okSj2LogcqUVoCqU0f6mT7+q9ASioxub2FnTYmzQUuQiT7wOVZOU+OSF/rpBma61VI4+u7pYUdDfSbz6qHXRN0qxLzsEgMHVRnFNBQBoCPZqHfgPgoUxBk0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787668024; c=relaxed/simple; bh=iggwS5qNk0O6dpFnEPch1q6f2uoYHUpDTK99QoQUsmk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Xo8J6agvf1RU1rUedQfSMphq1WEQMxxFMlwTrsPdey3cwzDOMwlwh/zxk6DWC9wbB5LPxvQeQpZT10tQ2XG8fSJbSz1qFG9tgz5wzVUx4W85EaBSLpSZGdZf/JprkoxAvWUgOQCvyBW+IIGQ8FnYfaHuR+B/uGMd/aWK3xfG2KM= 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=UlTmcQtE; arc=none smtp.client-ip=209.85.214.199 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="UlTmcQtE" Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2cc7e86e7c5so86272785ad.3 for ; Tue, 25 Aug 2026 07:27:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1787668022; x=1788272822; darn=vger.kernel.org; h=content-transfer-encoding:content-type:cc:to:from:subject :message-id:references:mime-version:in-reply-to:date:from:to:cc :subject:date:message-id:reply-to:content-type; bh=p7z5jNTdUBIQty4rQGf4wGM+0E3saDplq3UPpEgCikk=; b=UlTmcQtESf/RPBr8k5uCo9KWdaXSpyVK8dpGxRDmKYu+q+2oqkxhfUnEOU6dUiBfHg a1OyUccp/+luY39pgn7jg6TVUFJsA9kCd8wlurlxuz2yP27j7jl3g/ViF+wbIZNvYsPU xzIp+nRT0F6kbJuD5jtnFdyvF9ePSUMez5MArdBYNB7wAlkgHTmJXsG/qBshYPoZYhwc Dl7w/Q7dvx9FVVt6I0PeUH4QyFOoBfsaT70Gz/w35wkBdLMDiw/scHO6fIaZIfkjruwa 3q2WG6wcDD8vOpRvyjzqMmn7xPxtmchgEArOm7deAfLlg/FAYwf41gmqEplRJbMyKLqN CMlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787668022; x=1788272822; h=content-transfer-encoding:content-type: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 :content-type; bh=p7z5jNTdUBIQty4rQGf4wGM+0E3saDplq3UPpEgCikk=; b=Jg4YBX4AeokwpJB3R85f9I1yzvEq5VmoS1LXmj+ARSkpXpGI73Y3HyW0idIpOr23EW JV5tkXVykbe4Q4PHqLa/RoNxvckkkEd2yq+kQIgTEqBuUXwpokfAdUtTwrECHogYb9e1 h/6mo62UuZzzmFPXYOsTr/dlJbIYugZkApgd28ZwspKxdo2cYh5KGYNdos+WdDozrIzM TMqpPrd4+MyYoODehBzvzPIxkHOPzHe5lSh9Nb+7wZdUFCBFdcQMIdrC4+8S/z8wrO2b x7FcvMiMPfA4mi3b9To06qDLIvYPdioJimlg1ju7xDykE0yQR3ZrIKBtkIOmh+jI6SjL yu/A== X-Forwarded-Encrypted: i=1; AHgh+RoNtzndAaw4dHRDTcHZgAbZzchHQ/dVViYGXpn7/PkMwvA4G3kW0nbztenj1NBXHMBuQAYKvn+tZNJ3lB0=@vger.kernel.org X-Gm-Message-State: AFuF++kM/AFhXFKmEDIISiWl51lg2QP23pzIc48wrsJ96hls9VfLR1Y9 Rhk5k7/tCROzKPtxuON97quglSfDuph3Z87I9UUDCIM7LYAEOAP0qA3Fflz53RSgCfP/y3p3deM Nd5GBUA== X-Received: from pgec18.prod.google.com ([2002:a63:9612:0:b0:c86:61a1:3390]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:5867:b0:395:4de4:92c8 with SMTP id 98e67ed59e1d1-395df4dcdbcmr55013906a91.15.1787668022148; Tue, 25 Aug 2026 07:27:02 -0700 (PDT) Date: Tue, 25 Aug 2026 07:27:01 -0700 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="utf-8" Content-Transfer-Encoding: quoted-printable On Tue, Aug 25, 2026, Paolo Bonzini wrote: > On Tue, Aug 25, 2026 at 3:33=E2=80=AFPM Mark Brown w= rote: > > > > Hi all, > > > > Today's linux-next merge of the kvm-x86 tree got a conflict in: > > > > tools/testing/selftests/kvm/steal_time.c > > > > between commit: > > > > 15a9a2ba0c546 ("Merge tag 'kvm-x86-selftests2-7.3' of https://github.= com/kvm-x86/linux into HEAD") > > > > from the kvm tree and commit: > > > > 12c2a7f18f579 ("Merge branch 'selftests2'") > > > > 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 tre= e > > is submitted for merging. You may also want to consider cooperating > > with the maintainer of the conflicting tree to minimise any particularl= y > > complex conflicts. >=20 > Thanks, this is just a small difference in how I fixed the conflict > between multiple kvm-x86 pull requests. Either version is fine, and > Sean will force-push to Linus's tree at some point anyway. I force-pushed using kvm/next, so this should go away. Thanks!