projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5856afe e88221c)
Merge branch 'x86/urgent' into x86/fpu, to resolve a conflict
authorIngo Molnar <mingo@kernel.org>
Wed, 20 May 2015 09:59:45 +0000 (11:59 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 20 May 2015 10:01:01 +0000 (12:01 +0200)
commit6f56a8d024757e2f3bda8bf3bdf6aa1a21e6810b
tree923d044c9cb5e3e89fdf02af35acc050e4f39195tree | snapshot
parent5856afed0c8c419286d9f0c8e57e83e2875eec4bcommit | diff
parente88221c50cadade0eb4f7f149f4967d760212695commit | 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>
arch/x86/kernel/fpu/init.c diff1 | | blob | history
John Crispins staging tree