On Fri, Mar 04, 2011 at 04:39:15PM +1100, Stephen Rothwell wrote:
> 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.
Thanks, that looks correct.
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
