* Catalin Marinas <catalin.marinas@xxxxxxx> wrote: > > (it's fine if the kmemleak tree has that commit too [it > > obviously needs it] - so there will still be a conflict - just > > the resolution will be a straightforward 'pick the x86 tree > > side' step.) > > There may not be a conflict if the changes are identical (but it > depends on what else is in the x86 tree). They will conflict, because the x86 tree has these changes in that area: arch/x86/kernel/vmlinux.lds.S | 430 ++++++++++- arch/x86/kernel/vmlinux_32.lds.S | 229 ------ arch/x86/kernel/vmlinux_64.lds.S | 298 ------- spread out in 15 commits. Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
