From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (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 1225E18DF64 for ; Thu, 9 Jan 2025 19:18:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736450308; cv=none; b=YZriM6+Nf9oG6Ky2iyf4fY5oC1TR4Ps2ZdY2fh0IUq3I4tY7XadUmVRUEfapuvI9R9nCrGTMyO52NrNl4a+8ex1V/XQwCAqWIysnARtlWBAmwgCdK8H6IpqIEg6280Mz8XycYM2uslbcaPsJupCWY5ibsqfLZAbcLhhiALueWvM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736450308; c=relaxed/simple; bh=Ha2sCuuLDa2wxxnktwog673oMcpczNJ/szL0tHZfzPI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=tUygXi+tjhPwQvFrcGwAFAOe4D8XRx615SaoMm2ySubcFrYnLudAn2wUOREJrUqgxciTbbO2xBmYH4ayF1/bxRa29KgiAZKRbYpPtgR2z51VJrtl/FJpFXZQF5eO6+fsPJdnbXZ9aBJHCgkZ49fRb5dOPFrhhLeIUa0Vws3GZ38= 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=mStMk1jW; arc=none smtp.client-ip=209.85.214.202 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="mStMk1jW" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2162f80040aso19960205ad.1 for ; Thu, 09 Jan 2025 11:18:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1736450305; x=1737055105; 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=4chx51XB7zNX4mevPlJWYkasEFr7nCx4b6zS7p7gvhs=; b=mStMk1jW7lx/EZl+UBk6gJI0B9HP77QRXvk12BydbSWs+kottpoxlGx7hM1mCZnwrL vmzQrckx49XPCa9m7fNvUzd5oAwHzOXMkOY7hHudQP901616m+Dqp9uDnOE8SuydBk3Y ee+bPYoMCDdzzOClVhTzdueH34ow1hR70gYiK+Be5Xh54k2AShuGCnn647sNLxDXwsbU VDHwq7u06LeKpfQb7yALU3mUMQHig0SdDYDFMtNBf9cqNKGzXf/JEOR4g20kFpQzMpiv z3dA4GOYBpX42DK5Zw9f86klUmBLDfOMEPLgXa+FyRiqMDaI+1SHOOxAybFYLrpnZ/0q C0Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736450305; x=1737055105; 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=4chx51XB7zNX4mevPlJWYkasEFr7nCx4b6zS7p7gvhs=; b=YEmTxmf9sZPpco8B8WGpxjPBFNxlBCUwfg5eRaoteQ+yq6UwK60Si2i40p8w8j/sJf 38KCW4EjhntfFAqLQML7A3laFopNodSskp9PQswyEkPvqDonf2q2VYiwYGKeN7SQwSKn rSCI3/IKB3jTH4IGLvsi6YOAmL+s90pT4/4SRUXJdarUq8lmncjIdUtd1C5vUf93G/9W MWp/KTPODLX55tMpx5B1hKQbrY0M8mo44a7I36nKefXWkUl4E3jeO+QuAQcQuvCaO+cH cHod3d8vMc/qIG5+ttT4NQEC718705iOXzrm8HmXzOX6g0y+xFSBZkDHgMRe64HHAjbt ARVg== X-Forwarded-Encrypted: i=1; AJvYcCUrWVNI4VwlaIXNFIgh4QncUSbKvMedQG8Fw2GiH60vFVlz/Di3u5rPpHa8zDCwXGNtnsPTFW9Gw49nZ6c=@vger.kernel.org X-Gm-Message-State: AOJu0YwhT+mzWk4+83ZMzC2rsn9LDH2xwsx1fj78aRO7/Vq2kxsCNi41 7nT4+sFvfLjslHN7kPn6N7wdUHneFdMag2bFjtrDCm6yHGz4EPkRF3tsQlAJPYjZZ8pkOY7QIcr BSg== X-Google-Smtp-Source: AGHT+IGO0istGx5XIPQTM85G2O2AhIv3xbPes1/5L5rfcTuXZ106F2SCqf7FOCFskx0QE9VZ/iwSbSUiizw= X-Received: from pfbhj7.prod.google.com ([2002:a05:6a00:8707:b0:725:df7a:f4e3]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:32cb:b0:725:df1a:288 with SMTP id d2e1a72fcca58-72d2201c96dmr13359102b3a.24.1736450305388; Thu, 09 Jan 2025 11:18:25 -0800 (PST) Date: Thu, 9 Jan 2025 11:18:24 -0800 In-Reply-To: <20250106150509.19432acd@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250106150509.19432acd@canb.auug.org.au> Message-ID: Subject: Re: linux-next: manual merge of the kvm-x86 tree with the tip tree From: Sean Christopherson To: Stephen Rothwell Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , "Borislav Petkov (AMD)" , Linux Kernel Mailing List , Linux Next Mailing List Content-Type: text/plain; charset="us-ascii" On Mon, Jan 06, 2025, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kvm-x86 tree got a conflict in: > > arch/x86/kvm/cpuid.c > > between commit: > > 716f86b523d8 ("KVM: x86: Advertise SRSO_USER_KERNEL_NO to userspace") > > from the tip tree and commits: > > ccf93de484a3 ("KVM: x86: Unpack F() CPUID feature flag macros to one flag per line of code") > 3cc359ca29ad ("KVM: x86: Rename kvm_cpu_cap_mask() to kvm_cpu_cap_init()") > 75c489e12d4b ("KVM: x86: Add a macro for features that are synthesized into boot_cpu_data") > 871ac338ef55 ("KVM: x86: Use only local variables (no bitmask) to init kvm_cpu_caps") > > from the kvm-x86 tree. > > I fixed it up (I think - see below) and can carry the fix as > necessary. Your resolution is good. I'm impressed you were able to wade through the chaos :-) Thanks much!