diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-04 11:41:58 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-04 11:41:58 +0100 |
commit | 0d8770815f70cf41b69a82ede272b026dbb2df7d (patch) | |
tree | 3f088af1c614fd3b73e3aeae64223088797ef873 /crypto/tcrypt.h | |
parent | 3e519dde1e8a73e59b0eab52575a14a2986283b6 (diff) | |
parent | d218af78492a36a4ae607c08fedfb59258440314 (diff) | |
download | linux-0d8770815f70cf41b69a82ede272b026dbb2df7d.tar.bz2 |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS updates from Ralf Baechle:
"This week's round of MIPS fixes:
- Fix JZ4740 build
- Fix fallback to GFP_DMA
- FP seccomp in case of ENOSYS
- Fix bootmem panic
- A number of FP and CPS fixes
- Wire up new syscalls
- Make sure BPF assembler objects can properly be disassembled
- Fix BPF assembler code for MIPS I"
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: scall: Always run the seccomp syscall filters
MIPS: Octeon: Fix kernel panic on startup from memory corruption
MIPS: Fix R2300 FP context switch handling
MIPS: Fix octeon FP context switch handling
MIPS: BPF: Fix load delay slots.
MIPS: BPF: Do all exports of symbols with FEXPORT().
MIPS: Fix the build on jz4740 after removing the custom gpio.h
MIPS: CPS: #ifdef on CONFIG_MIPS_MT_SMP rather than CONFIG_MIPS_MT
MIPS: CPS: Don't include MT code in non-MT kernels.
MIPS: CPS: Stop dangling delay slot from has_mt.
MIPS: dma-default: Fix 32-bit fall back to GFP_DMA
MIPS: Wire up userfaultfd and membarrier syscalls.
Diffstat (limited to 'crypto/tcrypt.h')
0 files changed, 0 insertions, 0 deletions