diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-05-13 10:35:00 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-05-13 10:35:00 +0200 |
| commit | fa6b90ee4fb13178f0b4e2109ab9e12daa9220c4 (patch) | |
| tree | 8b3ae324b47f4e331e51303a86aad388245ce7ee /scripts/lib/kdoc/kdoc_re.py | |
| parent | 11d8f542d9137027440001b075da60a59c7871cb (diff) | |
| parent | 4b626015e1bf119cd31d7e62f9bd9eb1412fce7b (diff) | |
Merge branch 'x86/asm' into x86/core, to merge dependent commits
Prepare to resolve conflicts with an upstream series of fixes that conflict
with pending x86 changes:
6f5bf947bab0 Merge tag 'its-for-linus-20250509' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts/lib/kdoc/kdoc_re.py')
0 files changed, 0 insertions, 0 deletions