| commit | 6f56a8d024757e2f3bda8bf3bdf6aa1a21e6810b | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Wed May 20 11:59:45 2015 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Wed May 20 12:01:01 2015 +0200 |
| tree | 923d044c9cb5e3e89fdf02af35acc050e4f39195 | |
| parent | 5856afed0c8c419286d9f0c8e57e83e2875eec4b [diff] | |
| parent | e88221c50cadade0eb4f7f149f4967d760212695 [diff] |
Merge branch 'x86/urgent' into x86/fpu, to resolve a conflict
Conflicts:
arch/x86/kernel/i387.c
This commit is conflicting:
e88221c50cad ("x86/fpu: Disable XSAVES* support for now")
These functions changed a lot, move the quirk to arch/x86/kernel/fpu/init.c's
fpu__init_system_xstate_size_legacy().
Signed-off-by: Ingo Molnar <mingo@kernel.org>