diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-21 06:49:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-21 06:49:41 -0800 |
| commit | 6210469417fd967ec72dea56723593beefeecafb (patch) | |
| tree | 8bfe73e84afcab4c25b3ee9252408da1ee2792bc /scripts | |
| parent | 62af608b4b075871f7214c345c42a2e7a456f35d (diff) | |
| parent | 75cf9797006a3a9f29a3a25c1febd6842a4a9eb2 (diff) | |
Merge branch 'parisc-5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pul parisc fixes from Helge Deller:
"Two build error fixes, one for the soft_offline_page() parameter
change and one for a specific KEXEC/KEXEC_FILE configuration, as well
as a compiler and a linker warning fix"
* 'parisc-5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Fix compiler warnings in debug_core.c
parisc: soft_offline_page() now takes the pfn
parisc: add missing __init annotation
parisc: fix compilation when KEXEC=n and KEXEC_FILE=y
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions