Hi all,
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.
Just a matter of overlapping additions. I took both sets.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpuSbTXhs3yY.pgp
Description: PGP signature
