git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Ingo Molnar <mingo@kernel.org>
	Sat, 16 Oct 2021 13:17:46 +0000 (15:17 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Sat, 16 Oct 2021 13:17:46 +0000 (15:17 +0200)
commit	7320acb3dcad31d1cf9528505353db44cbfc0c44
tree	6170af99f1491fe256351b9cf92725dbda79c153	tree \| snapshot
parent	33711c7a03aba966d68de400a653628ccd918b83	commit \| diff
parent	5b3d556bbf05707d9159491b640c9d784f594388	commit \| diff

Merge branch 'x86/urgent' into x86/fpu, to resolve a conflict

Resolve the conflict between these commits:

   x86/fpu:      27a5faad3bab ("x86/fpu/signal: Change return type of __fpu_restore_sig() to boolean")

   x86/urgent:   4726560991e2 ("x86/fpu: Restore the masking out of reserved MXCSR bits")
                 5b3d556bbf05 ("x86/fpu: Mask out the invalid MXCSR bits properly")

Conflicts:
        arch/x86/kernel/fpu/signal.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

Linux Kernel Source Tree.

RSS Atom

arch/x86/kernel/cpu/mce/core.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/fpu/signal.c	diff1 \|	diff2 \|	blob \| history
arch/x86/net/bpf_jit_comp.c	diff1 \|	diff2 \|	blob \| history
scripts/sorttable.c	diff1 \|	diff2 \|	blob \| history