Hi all,

Today's linux-next merge of the stackprotector tree got a trivial
conflict in kernel/fork.c between commit
177a5f86ba5f60c783e24603bedf037d6c43a193 ("tracing, sched: LTTng
instrumentation - scheduler") from the ftrace tree and commit
7c9f8861e6c9c839f913e49b98c3854daca18f27 ("stackprotector: use canary at
end of stack to indicate overruns at oops time") from the stackprotector
tree.

Just overlapping additions of includes.  I added both.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/