author | Linus Torvalds <torvalds@linux-foundation.org> | |
Thu, 20 Dec 2018 15:35:16 +0000 (07:35 -0800) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Thu, 20 Dec 2018 15:35:16 +0000 (07:35 -0800) |
Pull m68k fix from Geert Uytterhoeven:
"Fix memblock-related crashes"
* tag 'm68k-for-v4.20-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Fix memblock-related crashes
"Fix memblock-related crashes"
* tag 'm68k-for-v4.20-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Fix memblock-related crashes
1 | 2 | |||
---|---|---|---|---|
arch/m68k/kernel/setup_mm.c | patch | | diff1 | | diff2 | | blob | history |
arch/m68k/mm/motorola.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc arch/m68k/kernel/setup_mm.c
Simple merge
diff --cc arch/m68k/mm/motorola.c
Simple merge