diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-07 20:00:30 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-07 20:00:30 +0300 |
| commit | 22dcc7d77fa463914bc2a2fb4580e6d183ca415d (patch) | |
| tree | 91c36cff4a61f214c83f6573cc1f0066c340cc9d /include/asm-generic | |
| parent | 70806ee18a871140a73a2524a29865e1d904348c (diff) | |
| parent | abaa02fc944f2f9f2c2e1925ddaceaf35c48528c (diff) | |
| download | linux-22dcc7d77fa463914bc2a2fb4580e6d183ca415d.tar.xz | |
Merge tag 'powerpc-6.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman:
- Fix PCIe MEM size for pci2 node on Turris 1.x boards
- Two minor build fixes
Thanks to Christophe Leroy, Douglas Anderson, Pali Rohár, Petr Mladek,
and Randy Dunlap.
* tag 'powerpc-6.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc: dts: turris1x.dts: Fix PCIe MEM size for pci2 node
powerpc: Include asm/nmi.c in mobility.c for watchdog_hardlockup_set_timeout_pct()
powerpc: allow PPC_EARLY_DEBUG_CPM only when SERIAL_CPM=y
Diffstat (limited to 'include/asm-generic')
0 files changed, 0 insertions, 0 deletions