diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-20 13:36:49 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-20 13:36:49 -0800 |
commit | 3939f2c8665721eef8315f42d4c57fb1272aacd6 (patch) | |
tree | 258141982571b8305baab64be3daddef4bd57274 /arch/riscv/Kconfig.socs | |
parent | Merge tag 'drm-fixes-2019-12-21' of git://anongit.freedesktop.org/drm/drm (diff) | |
parent | arm64: cpu_errata: Add Hisilicon TSV110 to spectre-v2 safe list (diff) | |
download | linux-dev-3939f2c8665721eef8315f42d4c57fb1272aacd6.tar.xz linux-dev-3939f2c8665721eef8315f42d4c57fb1272aacd6.zip |
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fixes from Catalin Marinas:
- Leftover put_cpu() in the perf/smmuv3 error path.
- Add Hisilicon TSV110 to spectre-v2 safe list
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: cpu_errata: Add Hisilicon TSV110 to spectre-v2 safe list
perf/smmuv3: Remove the leftover put_cpu() in error path
Diffstat (limited to 'arch/riscv/Kconfig.socs')
0 files changed, 0 insertions, 0 deletions