Stephen Rothwell wrote:
Today's linux-next merge of the slab tree got a conflict in
lib/Kconfig.debug between commit 3794f3e812ef707a4f7931742274d1d0ca6597b4
("docsrc: build Documentation/ sources") from Linus' tree and commit
5db80305ad7ea891246aec24204630c2925e7b12 ("kmemtrace: Core
implementation") from the slab tree.
I've now fixed up the conflict in my tree. Thanks Stephen!
--
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
