"...0d0cea2424ae97b27447dc64a7dbfae83c036c45b403392f0e8ba.png" did not exist on "9f6c38e70b6c7ea379394a755fe76e09996f5370"
Merge branch 'x86/urgent' into x86/pat
Reason: Change to is_new_memtype_allowed() in x86/urgent
Resolved semantic conflicts in:
arch/x86/mm/pat.c
arch/x86/mm/ioremap.c
Signed-off-by:
H. Peter Anvin <hpa@zytor.com>
Loading
Please register or sign in to comment