From: Mark Brown <broonie@kernel•org>
To: Sean Christopherson <seanjc@google•com>
Cc: Dapeng Mi <dapeng1.mi@linux•intel.com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Mingwei Zhang <mizhang@google•com>,
Peter Zijlstra <peterz@infradead•org>
Subject: linux-next: manual merge of the kvm-x86 tree with the tip tree
Date: Fri, 19 Sep 2025 14:50:46 +0100 [thread overview]
Message-ID: <aM1ftiUjafju0D6I@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1630 bytes --]
Hi all,
Today's linux-next merge of the kvm-x86 tree got a conflict in:
arch/x86/include/asm/msr-index.h
between commit:
0c5caea762de3 ("perf/x86: Add PERF_CAP_PEBS_TIMING_INFO flag")
from the tip tree and commit:
cdfed9370b96a ("KVM: x86/pmu: Move PMU_CAP_{FW_WRITES,LBR_FMT} into msr-index.h header")
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.
diff --cc arch/x86/include/asm/msr-index.h
index 718a55d82fe45,717baeba6db3c..0000000000000
--- a/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
@@@ -315,14 -315,15 +315,16 @@@
#define PERF_CAP_PT_IDX 16
#define MSR_PEBS_LD_LAT_THRESHOLD 0x000003f6
-
+ #define PERF_CAP_LBR_FMT 0x3f
#define PERF_CAP_PEBS_TRAP BIT_ULL(6)
#define PERF_CAP_ARCH_REG BIT_ULL(7)
#define PERF_CAP_PEBS_FORMAT 0xf00
+ #define PERF_CAP_FW_WRITES BIT_ULL(13)
#define PERF_CAP_PEBS_BASELINE BIT_ULL(14)
+#define PERF_CAP_PEBS_TIMING_INFO BIT_ULL(17)
#define PERF_CAP_PEBS_MASK (PERF_CAP_PEBS_TRAP | PERF_CAP_ARCH_REG | \
- PERF_CAP_PEBS_FORMAT | PERF_CAP_PEBS_BASELINE)
+ PERF_CAP_PEBS_FORMAT | PERF_CAP_PEBS_BASELINE | \
+ PERF_CAP_PEBS_TIMING_INFO)
#define MSR_IA32_RTIT_CTL 0x00000570
#define RTIT_CTL_TRACEEN BIT(0)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-09-19 13:50 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-19 13:50 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-05-27 14:22 linux-next: manual merge of the kvm-x86 tree with the tip tree Mark Brown
2026-05-18 16:10 Mark Brown
2026-03-04 12:21 Mark Brown
2026-03-04 23:10 ` Sean Christopherson
2026-03-05 19:24 ` Nathan Chancellor
2026-03-06 13:24 ` Mark Brown
2026-03-06 22:48 ` Nathan Chancellor
2025-11-25 4:59 Stephen Rothwell
2025-11-25 7:09 ` Borislav Petkov
2025-12-04 5:10 ` Stephen Rothwell
2025-11-20 4:52 Stephen Rothwell
2025-11-20 4:46 Stephen Rothwell
2025-10-20 0:07 Stephen Rothwell
2025-09-22 9:50 Mark Brown
2025-09-22 11:27 ` Aithal, Srikanth
2025-09-22 11:40 ` Mark Brown
2025-09-22 13:23 ` Mark Brown
2025-09-22 14:04 ` Sean Christopherson
2025-09-30 18:13 ` Paolo Bonzini
2025-01-06 4:05 Stephen Rothwell
2025-01-09 19:18 ` Sean Christopherson
2025-01-23 3:25 ` Stephen Rothwell
2024-02-07 4:35 Stephen Rothwell
2023-01-19 23:54 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aM1ftiUjafju0D6I@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=dapeng1.mi@linux$(echo .)intel.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mizhang@google$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=seanjc@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox