diff options
| author | Linus Torvalds <[email protected]> | 2021-04-12 16:03:49 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2021-04-12 16:03:49 +0000 |
| commit | 89698becf06d341a700913c3d89ce2a914af69a2 (patch) | |
| tree | 75e7b671226a5f533ff139a0b2f5378e43f1ef07 /tools/perf/builtin-annotate.c | |
| parent | Linux 5.12-rc7 (diff) | |
| parent | m68k: fix flatmem memory model setup (diff) | |
| download | kernel-89698becf06d341a700913c3d89ce2a914af69a2.tar.gz kernel-89698becf06d341a700913c3d89ce2a914af69a2.zip | |
Merge tag 'm68knommu-for-v5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu fix from Greg Ungerer:
"Some m68k platforms with a non-zero memory base fail to boot with the
recent flatmem changes.
This is a single regression fix to the pfn offset for that case"
* tag 'm68knommu-for-v5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: fix flatmem memory model setup
Diffstat (limited to 'tools/perf/builtin-annotate.c')
0 files changed, 0 insertions, 0 deletions