Re: davinci vs. v4l2: lots of conflicts in merge for linux-next

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Em Wed, 26 Aug 2009 11:00:22 -0500
"Karicheri, Muralidharan" <m-karicheri2@xxxxxx> escreveu:

> Kevin,
> 
> Ok, I see you have merged vpif capture architecture part to master branch
> of davinci. 
> 
> So what you are suggesting is to remove all vpif/vpfe patches from arch/arm/davinci of v4l linux-next tree (So I guess this is what Mauro should do on linux-next). So architecture part of all future video patches are to be re-created and re-submitted based on davinci-next and will be merged only to davinci tree and Mauro will merge the v4l part.

I'll drop those patches from my tree.

> Kevin & Mauro,
> 
> So only concern I have is that these patches may not compile (either architecture part or v4l part) until the counter part becomes available on the tree. Is this fine? 

The strategy we use for solving those troubles is to move the Kbuild patches
that adds the compilation for the driver to be merged at the end of the series.
If, without this patch, the kernel will keep compiling, everything is fine.

Cheers,
Mauro
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Input]     [Video for Linux]     [Gstreamer Embedded]     [Mplayer Users]     [Linux USB Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux