On Tue, 17 Feb 2009, Stephen Rothwell wrote:
> Today's linux-next merge of the trivial tree got a conflict in
> drivers/media/video/gspca/t613.c between commit
> 99a9fcc84dd6310b724f6dca684043f1cd33f00d ("V4L/DVB (10381): gspca - t613:
> New unknown sensor added") from the v4l-dvb tree and commit
> 3c2e94a5fac4daac0bacd432ceeaff067957ee2b ("trivial: V4L: Storage class
> should be before const qualifier") from the trivial tree.
>
> Juts context changes. I fixed it up (see below) and can carry the fix as
> necessary. Jiri, maybe some of these could be fed to the appropriate
> maintainers?
Hi Stephen,
yes, in fact I have pinged linux-media and other parties about that
yesterday [1]. When Mauro confirms that he picked it up, I will drop it
from trivial tree.
[1] http://www.mail-archive.com/linux-media@xxxxxxxxxxxxxxx/msg01568.html
Thanks,
--
Jiri Kosina
SUSE Labs
--
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
