Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/easycap/easycap_ioctl.c between commit
0ff69fe7cebb65856eba7feb3fd76fb4ba365bf8 ("[media] v4l: removal of old,
obsolete ioctls") from the v4l-dvb tree and commits
f62bc44e055712fc8ccf34654a79137dd4a4d8af ("staging/easycap: remove
obsolete VIDIOC_S_CTRL_OLD ioctl") and
50e1fbdc1c9965b6ddbc5c9900377ff18bbf9ae8 ("staging/easycap: add first
level indentation to easycap_ioctl.c") from the staging tree.
The latter two were a superset of the former, so I used that.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp9Pctp3HGBQ.pgp
Description: PGP signature
