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

projects / platform / kernel / linux-starfive.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: aaeed6e 83aa52f)

author	Ingo Molnar <mingo@kernel.org>
	Tue, 15 Mar 2022 11:50:49 +0000 (12:50 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Tue, 15 Mar 2022 11:50:59 +0000 (12:50 +0100)
commit	8c490b42fe91c10d5756efe56014240c669e7720
tree	305c483f5d51cf9866ab4c75282da89d333247c1	tree \| snapshot
parent	aaeed6ecc1253ce1463fa1aca0b70a4ccbc9fa75	commit \| diff
parent	83aa52ffed5d35a08e24452d0471e1684075cdf8	commit \| diff

Merge branch 'x86/pasid' into x86/core, to resolve conflicts

Conflicts:
tools/objtool/arch/x86/decode.c

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

arch/x86/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
drivers/iommu/intel/iommu.c	diff1 \|	diff2 \|	blob \| history
include/linux/mm_types.h	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;