diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-02 18:27:02 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-02 18:27:02 +0200 |
| commit | 496dcc5091e4c79f18ebae514e0e79e44a72993a (patch) | |
| tree | 63e3870e9b3003c2d75d3a3230da2cad2e003cac /arch/m68k/coldfire/nettel.c | |
| parent | Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | x86/boot: Include missing header file (diff) | |
| download | linux-496dcc5091e4c79f18ebae514e0e79e44a72993a.tar.xz linux-496dcc5091e4c79f18ebae514e0e79e44a72993a.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Thomas Gleixner:
"This update provides:
- prevent KASLR from randomizing EFI regions
- restrict the usage of -maccumulate-outgoing-args and document when
and why it is required.
- make the Global Physical Address calculation for UV4 systems work
correctly.
- address a copy->paste->forgot-edit problem in the MCE exception
table entries.
- assign a name to AMD MCA bank 3, so the sysfs file registration
works.
- add a missing include in the boot code"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/boot: Include missing header file
x86/mce/AMD: Give a name to MCA bank 3 when accessed with legacy MSRs
x86/build: Mostly disable '-maccumulate-outgoing-args'
x86/mm/KASLR: Exclude EFI region from KASLR VA space randomization
x86/mce: Fix copy/paste error in exception table entries
x86/platform/uv: Fix calculation of Global Physical Address
Diffstat (limited to 'arch/m68k/coldfire/nettel.c')
0 files changed, 0 insertions, 0 deletions