Hi Arnd,
Today's linux-next merge of the bkl-llseek tree got conflicts in
drivers/staging/batman-adv/icmp_socket.c and
drivers/staging/batman-adv/bat_debugfs.c between commit
2d77bb592f6cabc5ee5322c03ee92b9f96c45f60 ("Staging: batman-adv: Mark
debugfs files as nonseekable") from the staging-next tree and commit
5295184fb318693b4ef2cd8056bf1a7cb43586d7 ("llseek: automatically
add .llseek fop") from the bkl-llseek tree.
I used the versions from the staging-next tree.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpNuOVvoq5sw.pgp
Description: PGP signature
