From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.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 86BE076031 for ; Tue, 20 Feb 2024 15:33:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708443225; cv=none; b=sAeNm18o4+bDC9sJTbZSYz+HBbhUUBGqiah9lLXopDaH6mpvJHomNsOrifBoh9txRyVTrmkPgjxFatwbQTd5w87lMtlowsZzW6ub1u9VW0vaDwyiiqMlv+jMT0cgz86xF6NJlnl+UqrgHntwsTHINnKJ92P5Cwu+fYX3beSPoCE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708443225; c=relaxed/simple; bh=7D7kf8p8aX2ZzflAMDnkhBwWgiUvsRg8uan55wPtdeo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=H0DUe3yxUVL51qhQhn8EkVgQs40VP7leL9rpRmit3zSWBWw60GEp7hhPxdIm1aTmbO0bZgjkqwEc5hlFWQKrBYWRp0NcJJuGY5mAwr34pLnvdCvpMWb1S35ZUZGrN2jmlUOdiQ8hBUAEYPJ2VWf7e634yWA2Bsp3JwckPm9j1/w= 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=3cpdQCDy; arc=none smtp.client-ip=209.85.128.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="3cpdQCDy" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-607e8e8c2f1so87211847b3.3 for ; Tue, 20 Feb 2024 07:33:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1708443222; x=1709048022; 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=1fzOe/J4kuriO/maOGNH55dN19fVKQtEmyIcU4m9sns=; b=3cpdQCDyg0mp5DZW2QTFvCcek4NqeDX7/LxCgHwuElM503dUoBSO7gIT1zXFtIJoJk Eqrfn3tQlO17zTIzFUB5Da0CpBVfAvgOvjTuzPeLRyqGkd3rW5zKtdM6laTGO/dw3B5u EcKxClAj1BrDglpYlG9x8rSdRLTNcFa+vPjHpaDq2PG7n8LWl0/PRern/zFiBMyNvxsk hgWsLiCYmfUMjvmN5Hsedn3k1BFFML47uUqPRqS6ntAraoVtSVWuWqLXNCIKV0npv5vX 2jVBdx7V5bsKNZ01R9eOsrIa5l7iHQ0RSqopNvC/mfGngYDFlJ/WDHPyyVZLo/g5VPHR u6bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708443222; x=1709048022; 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=1fzOe/J4kuriO/maOGNH55dN19fVKQtEmyIcU4m9sns=; b=Qa4Fh2W+1tTaX9ZHJNT09ndbKvt+yfYKKyrFFv6J8qtVQRJSnfTdxX8BSYaO7cba/S yx7G+ASsTdXOKDHVwKSWbqqM9KAZjCaLASet825keR5h+fT6DW6/alJNTobOILwqG2IV qBroiX1y9+RJ2qygyYKibuDoF3a0QWDqBKwDdWPU2o7QRAlT2c3AJjKF6uG+HMCU1BcY oDOipIkxCqaBH9/QAxac27EN3KydzhhRgnpzLSk4Gl95N1ntgTdLhkqj52EdCpqPutBc WoCjAkkaniGNGKjJIxXDwjNWk4RKEqXv14UHzoTs9YWuxFMUTfxwK3wyio8hpvdnNshx 4ClA== X-Forwarded-Encrypted: i=1; AJvYcCU5q9fM7fFUOl3Rrb0JfKlcxfYKep+OHOL85QLEQQXEDKgHpKiFpIILT8NqXNKsGLp/tk+IgXL7ZrgFDKM81hNAenud3htdIPhgGw== X-Gm-Message-State: AOJu0YzmaryNr+ZeN2loh+ZYdnVBrreAG5tSZu2/VDM8jAdJHzD7a49k 6VImUmDO2XMInghNJ1WFcuAtBY5gK2djAX1GBGRkvFUk4Irpg4ZXDV5IaIkwUqMpbH3H0AMtIpI 8xw== X-Google-Smtp-Source: AGHT+IHV2QTvanF7VyH48/qvRHmtqg+UWhaoc+cyGK8cObSo3PadCiUndGKk4nt1DLGsJf5NFU55wseFcsE= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a81:4f83:0:b0:608:6c70:8d6 with SMTP id d125-20020a814f83000000b006086c7008d6mr178184ywb.2.1708443222505; Tue, 20 Feb 2024 07:33:42 -0800 (PST) Date: Tue, 20 Feb 2024 07:33:40 -0800 In-Reply-To: <20240220134800.40efe653@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240220134800.40efe653@canb.auug.org.au> Message-ID: Subject: Re: linux-next: manual merge of the kvm-x86 tree with the kvm tree From: Sean Christopherson To: Stephen Rothwell Cc: Paolo Bonzini , KVM , Linux Kernel Mailing List , Linux Next Mailing List , Paul Durrant Content-Type: text/plain; charset="us-ascii" On Tue, Feb 20, 2024, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kvm-x86 tree got a conflict in: > > include/uapi/linux/kvm.h > > between commit: > > bcac0477277e ("KVM: x86: move x86-specific structs to uapi/asm/kvm.h") > > from the kvm tree and commits: > > 01a871852b11 ("KVM: x86/xen: allow shared_info to be mapped by fixed HVA") > 3a0c9c41959d ("KVM: x86/xen: allow vcpu_info to be mapped by fixed HVA") > > from the kvm-x86 tree. /facepalm I asked Paolo for a topic branch specifically to avoid this conflict, and then managed to forget about it. I'll rebase the xen patches and force push.