Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
include/linux/kthread.h between commit
ed9559d38a87a44e3bda87d73a50aab92471d7dc ("Label kthread_create() with
printf attribute tag") from Linus' tree (which is also in the rr tree as
"misc:kthread-printf-attribute") and commit
b7298a2ec9cea26892cebb99916349e974b254fb ("misc:kthread-typesafe") from
the rr tree.
I used the rr tree version.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpdJQsxLiTD7.pgp
Description: PGP signature
