Gentwo Git Trees - linux/.git/commit

]> Gentwo Git Trees - linux/.git/commit

gentwo / linux / .git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 69cb33e 1b3f2bd)

author	Ingo Molnar <mingo@kernel.org>
	Tue, 13 May 2025 08:39:22 +0000 (10:39 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Tue, 13 May 2025 08:39:22 +0000 (10:39 +0200)
commit	34be751998c1407a460efe3a20f9c4ddb8c82b9f
tree	e6b55b0ee269828b0cb63c67039c094ef0f407dc	tree \| snapshot
parent	69cb33e2f81a3265383f0c8bbd27c32b4a5a6bf3	commit \| diff
parent	1b3f2bd04d90f61e1f291b5e365b9bc4ce0ea7c7	commit \| diff

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

Conflicts:
arch/x86/mm/numa.c
arch/x86/mm/pgtable.c

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

arch/x86/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/numa.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/pgtable.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/tlb.c	diff1 \|	diff2 \|	blob \| history

Development tree.