Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in kernel/smp.c
between commit 562d8c23497402eb7eb9caf8dab84439a03a49ea ("smp: reduce
stack requirements for smp_call_function_mask") from the cpus4096 tree
and commit ("1855648ee0b5ed8fe800edf401bbe25a3f2ed94a") from the rr tree.
Overlapping changes. I have used the version from the rr tree, but I am
not sure if that is the correct thing to do.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
--
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
