Hi Arnd,
Today's linux-next merge of the bkl-llseek tree got a conflict in
sound/oss/sh_dac_audio.c between commit
095a0f6df246bdc57b57d616c4698e41fbd3bf43 ("SOUND-OSS: Remove
sh_dac_audio") from the sound tree and commit
5295184fb318693b4ef2cd8056bf1a7cb43586d7 ("llseek: automatically
add .llseek fop") from the bkl-llseek tree.
The former just removes the file updated by the latter. I just removed
the file.
Arnd, (assuming that you will do a rebase anyway) you may as well just
drop the hunk that affects this file.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpDs3EP_Vk8b.pgp
Description: PGP signature
