Hi all,
Today's linux-next merge of the kmemcheck tree got a conflict in
mm/slab.c between commit fccd5095804ffc190cb2371c319cb4f5b2c0ee14
("kmemtrace: SLAB hooks") from the slab tree and commit
30532cb3c49a2a9fed94127aab26003c52398a51 ("slab: add hooks for
kmemcheck") from the kmemcheck tree.
Simply overlapping additions of includes.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpccsEOjXoRL.pgp
Description: PGP signature
