* Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi all,
>
> Today's linux-next merge of the stackprotector tree got a conflict in
> arch/x86/kernel/setup_percpu.c between various commits from the x86 tree
> and commit 18e7651254221ad0d3cf993cce742858c4521c55 ("manual merge of
> stackprotector") from the stackprotector tree.
>
> I just used the version of this file from tip/master.
ok - i also eliminated the conflict so interaction should go
away in the next integration.
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
