diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-10 11:34:33 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-10 11:34:33 -0800 |
commit | b3cd1a16cc8829776523fcd114299373be4e5187 (patch) | |
tree | 64ccc1f24275c1e84fa2aaec1836ff2a59bd4a61 /include/net/ip_tunnels.h | |
parent | a440e4d7618cbe232e4f96dea805bcb89f79b18c (diff) | |
parent | 3ce47d95b7346dcafd9bed3556a8d072cb2b8571 (diff) | |
download | linux-b3cd1a16cc8829776523fcd114299373be4e5187.tar.bz2 |
Merge tag 'powerpc-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman:
- A fix for machine check handling with VMAP stack on 32-bit.
- A clang build fix.
Thanks to Christophe Leroy and Nathan Chancellor.
* tag 'powerpc-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc: Handle .text.{hot,unlikely}.* in linker script
powerpc/32s: Fix RTAS machine check with VMAP stack
Diffstat (limited to 'include/net/ip_tunnels.h')
0 files changed, 0 insertions, 0 deletions