diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-30 12:28:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-30 12:28:44 -0700 |
| commit | ffeb595d84811dde16a28b33d8a7cf26d51d51b3 (patch) | |
| tree | 4ec3e3ad9a635a1e72dea4fc1f1b2f497fa9d3fc /include/linux/netfilter/nf_conntrack_pptp.h | |
| parent | 900db15047044ef50b32e23630880f4780ec5b9e (diff) | |
| parent | 2f26ed1764b42a8c40d9c48441c73a70d805decf (diff) | |
| download | linux-ffeb595d84811dde16a28b33d8a7cf26d51d51b3.tar.bz2 | |
Merge tag 'powerpc-5.7-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman:
- a fix for the recent change to how we restore non-volatile GPRs,
which broke our emulation of reading from the DSCR (Data Stream
Control Register).
- a fix for the recent rewrite of interrupt/syscall exit in C, we need
to exclude KCOV from that code, otherwise it can lead to
unrecoverable faults.
Thanks to Daniel Axtens.
* tag 'powerpc-5.7-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc/64s: Disable sanitisers for C syscall/interrupt entry/exit code
powerpc/64s: Fix restore of NV GPRs after facility unavailable exception
Diffstat (limited to 'include/linux/netfilter/nf_conntrack_pptp.h')
0 files changed, 0 insertions, 0 deletions