]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b4af416 a95d7a4)
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)
commit58612115b57c34cece9238898acb147577c729a7
tree923d044c9cb5e3e89fdf02af35acc050e4f39195tree | snapshot
parentb4af41635efeee552f552742197e8f0c7e6792adcommit | diff
parenta95d7a4567878751fe6936f1d6899b18d9d928facommit | diff
Merge branch 'x86/urgent' into x86/fpu, to resolve a conflict

Conflicts:
arch/x86/kernel/i387.c

This commit is conflicting:

  a95d7a456787 ("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
Linux Kernel Source Tree.