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	979274d016877c73de440a64f08a129d0604c65a
tree	6170af99f1491fe256351b9cf92725dbda79c153	tree \| snapshot
parent	1b1a081189d043c148221273fd3aaaceffe67c72	commit \| diff
parent	b92174f31ac119f9e7d00cffc1a7ecddbed0a056	commit \| diff

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

Resolve the conflict between these commits:

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

   x86/urgent:   73a91c186368 ("x86/fpu: Restore the masking out of reserved MXCSR bits")
                 b92174f31ac1 ("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