Merge tag 'v4.16-rc7' into x86/mm, to fix up conflict
Conflicts:
arch/x86/mm/init_64.c
Signed-off-by:
Ingo Molnar <mingo@kernel.org>
Loading
Please register or sign in to comment
Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
Conflicts:
arch/x86/mm/init_64.c
Signed-off-by:
Ingo Molnar <mingo@kernel.org>