diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-05-13 10:32:24 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-05-13 10:33:41 +0200 |
| commit | 11d8f542d9137027440001b075da60a59c7871cb (patch) | |
| tree | 1a89748cbaf7b47abff5255d1fdac97ad21385bf /scripts/lib/kdoc/kdoc_re.py | |
| parent | 82f2b0b97b36ee3fcddf0f0780a9a0825d52fec3 (diff) | |
| parent | 7f9958230d8a79d474829bee25ec9426397335ce (diff) | |
Merge branch 'x86/alternatives' 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