From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (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 75E4161FFE for ; Mon, 22 Sep 2025 14:04:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758549896; cv=none; b=s8JmuXQFyNYrNHJJjstLc0KH/Jbyu9xrd5Mujt6pIAaMZllJDROHnf+NmvybaXeECOy/d6olg/+ChOM4aAIXthTLLVz4iSvpCr2s9itqVpL93o5Y6IeEzRjAF2o1wogbuDH2VrOQLTzU8hDtYNyXekSXa9O7I/Rv0WvbQaIPEVs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758549896; c=relaxed/simple; bh=/sjcY9Fa5XFylluVuxusVCNMtRrfJbTjfjaQE20VI70=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=CuKq43/NXOt/l8bgbv4NHN0wnlffiPm9Qo136VYhFZswSRa9B0LLAx31g3HwfOop38QM2sXfmkcWeBCM9UmEm7J47m3K0hNonqmRxN390zF4NajII3pTB7e8HbKzZK4JJM6auRWjnME3W7Spec4FS8pEQOB2eF3jmXyD/vouX7I= 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=g4XktSv8; arc=none smtp.client-ip=209.85.216.74 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="g4XktSv8" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-329c76f70cbso3805803a91.0 for ; Mon, 22 Sep 2025 07:04:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1758549895; x=1759154695; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:from:to:cc:subject:date:message-id :reply-to; bh=2heiCNaQg0i2C5CkgyQt/hQuQrr2a5K2z0DwRmV5M/o=; b=g4XktSv8kxMDE1maJ22CApN4ApUn/klU4pwm5YBmC0PCF09D7aCqp6QRQ3hlol5aM9 JfgG0YLGlPBa7vliZnYWRQ+RSeR1rz4wxGaXUBv9axkIVoeoWY2sMJFRAE5MhUmub+e6 D0ilXxPW08Cw9DnLv72tK9oRaA4wFaH8VG3wUx0NdvO0nRt2Ht0GIYedi1d/l+NDAM43 Gjdtv8YlC1PxwPc/J86LLk2HqTg7m2yDOLiMHpxFzP837OZwUebzZO5UXczQuZvR/uwn wDVXiNttZTGwOV5HaO9SANtlcm5uZVDS9Hwg3kfj3FFc9HTnVuDlk3Alem8oNIVA1Obt RopA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758549895; x=1759154695; h=content-transfer-encoding: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=2heiCNaQg0i2C5CkgyQt/hQuQrr2a5K2z0DwRmV5M/o=; b=IYXr3PqI/aswRhzJU6Qhw6MwK9LxGmfN4ea37zEsUY7aHfk6uga42vz2DDUcHm5bro +vK1e3ILQfXtFagQDSjguGJZGnMTW06iAZjxjS/ERO6XMan/oEmZbyZMu1cXkPpW30sr Cclf3ekPoqsWojVqOloMsl9g36PfQLw02C7jP5n8Xv5MtvShQ2dgmXZapP0rut0YsZp0 BmVaPqMa9YkhUsdkC63j1IrZlzFPVnAuDQoIpWQcAADTVAdfp638rbQtaxLcBQPmq7/k euv/7vYl8E4Q1LWHOjzjvx++0tT/v7iIr1JrvYmkBzCFmTdtQ+R82KnQXZkY3K64ljCs NbTA== X-Forwarded-Encrypted: i=1; AJvYcCVn1ga53hA/mqIG+HHREyKaopVWOFIQrDEWdhwDiRhyFy0eWoiNQ6MF6C6pLH0vhRM/wyz8xMqRcEvdbEo=@vger.kernel.org X-Gm-Message-State: AOJu0YwJD4IxkyZc4ECza0ndh+Bw6uAroLkTgqUTTrn+Cq+dkvKj8jez cDLkSGLBJIeVSTmn1WPYbzLj7u/rVY+M3vm9JBli7HBkLANnvfmCUovHqjJFyraFTy0IY6ZNWPd q4TRBzg== X-Google-Smtp-Source: AGHT+IGL72q1bTs3P0fdVgVC7YK+Ah9k+m4H28Nhfd8zENqra69s7jdTZUpaIiWplJKUQYNz1olJAXEyid0= X-Received: from pjbmf16.prod.google.com ([2002:a17:90b:1850:b0:32b:95bb:dbc]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:1a91:b0:32e:3f93:69dc with SMTP id 98e67ed59e1d1-3309836d35bmr15727800a91.25.1758549894748; Mon, 22 Sep 2025 07:04:54 -0700 (PDT) Date: Mon, 22 Sep 2025 07:04:50 -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: <409d5703-ca0b-4b4b-a221-4e38ea92ae9a@amd.com> Message-ID: Subject: Re: linux-next: manual merge of the kvm-x86 tree with the tip tree From: Sean Christopherson To: Mark Brown Cc: Srikanth Aithal , Linux Kernel Mailing List , Linux Next Mailing List , Peter Zijlstra Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable On Mon, Sep 22, 2025, Mark Brown wrote: > On Mon, Sep 22, 2025 at 04:57:39PM +0530, Aithal, Srikanth wrote: > > Hello, > >=20 > > Todays linux-next build fails with below error on AMD x86: > >=20 > > arch/x86/kvm/emulate.c:4091:9: error: implicit declaration of function = =E2=80=98F=E2=80=99 > > [-Werror=3Dimplicit-function-declaration] > > 4091 | F(DstMem | SrcNone | Lock, em_inc), > > | ^ >=20 > That'll be me doing a mismerge I expect and should've taken the other > side of the merge for these, I'm quite surprised that the x86 > allmodconfig builds didn't trip this up :(=20 Yeah, essentially just s/F/I for the em{inc,dec} entries. --- arch/x86/kvm/emulate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index beda7030e40a..7d520da8dafc 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -4088,8 +4088,8 @@ static const struct opcode group4[] =3D { }; =20 static const struct opcode group5[] =3D { - F(DstMem | SrcNone | Lock, em_inc), - F(DstMem | SrcNone | Lock, em_dec), + I(DstMem | SrcNone | Lock, em_inc), + I(DstMem | SrcNone | Lock, em_dec), I(SrcMem | NearBranch | IsBranch | ShadowStack, em_call_near_abs), I(SrcMemFAddr | ImplicitOps | IsBranch | ShadowStack, em_call_far), I(SrcMem | NearBranch | IsBranch, em_jmp_abs), base-commit: bf2602a3cb2381fb1a04bf1c39a290518d2538d1 --