Hi all,
Today's linux-next merge of the kmemcheck tree got a conflict in
mm/slab.c between commit 51cc50685a4275c6a02653670af9f108a64e01cf ("SL*B:
drop kmem cache argument from constructor") from Linus' tree and commit
c9506812f317bca0edcbc717c8fdabdd1d0a264b ("slab: move struct kmem_cache
to headers") from the kmemcheck tree.
The former changed the ctor field of the structure that the latter moved
to a different file. I fixed it up in its new location.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp7UzNsnK124.pgp
Description: PGP signature
