Hi Andrew,
Today's linux-next merge of the akpm-current tree got conflicts in:
Documentation/filesystems/proc.txt
fs/proc/array.c
fs/proc/base.c
between commit:
b2f73922d119 ("fs/proc, core/debug: Don't expose absolute kernel addresses
via wchan")
from the tip tree and commit:
f01df89b6372 ("fs/proc: don't expose absolute kernel addresses via wchan")
7adc347341f1 ("fs-proc-dont-expose-absolute-kernel-addresses-via-wchan-fix")
from the akpm-current tree.
I fixed it up (the tip tree version seemed newer, so I used that) and
can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell s...@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
