review.tizen.org Git - platform/kernel/linux-rpi.git/commit

projects / platform / kernel / linux-rpi.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	082f20b21de20285da2cbfc1be29656f0714c1b8
tree	6170af99f1491fe256351b9cf92725dbda79c153	tree \| snapshot
parent	724fc0248d450224b19ef5b5ee41e392348f6704	commit \| diff
parent	b2381acd3fd9bacd2c63f53b2c610c89959b31cc	commit \| diff

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

Resolve the conflict between these commits:

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

   x86/urgent:   d298b03506d3 ("x86/fpu: Restore the masking out of reserved MXCSR bits")
                 b2381acd3fd9 ("x86/fpu: Mask out the invalid MXCSR bits properly")

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

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

Domain: System / Kernel;

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