diff options
| author | Linus Torvalds | 2015-04-18 17:31:11 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2015-04-18 17:31:11 +0200 |
| commit | 90d1c087861dcc3d1175993fc03492c137fd21bb (patch) | |
| tree | ee90db200e3c5c249cf3150249c0f8c700e300d2 /net/sysctl_net.c | |
| parent | Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected (diff) | |
| download | kernel-qcow2-linux-90d1c087861dcc3d1175993fc03492c137fd21bb.tar.gz kernel-qcow2-linux-90d1c087861dcc3d1175993fc03492c137fd21bb.tar.xz kernel-qcow2-linux-90d1c087861dcc3d1175993fc03492c137fd21bb.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"This tree includes:
- an FPU related crash fix
- a ptrace fix (with matching testcase in tools/testing/selftests/)
- an x86 Kconfig DMA-config defaults tweak to better avoid
non-working drivers"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected
x86/fpu: Load xsave pointer *after* initialization
x86/ptrace: Fix the TIF_FORCED_TF logic in handle_signal()
x86, selftests: Add single_step_syscall test
Diffstat (limited to 'net/sysctl_net.c')
0 files changed, 0 insertions, 0 deletions