Re: [PULL] http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-core2
Hi Mauro On Sun, 23 Aug 2009, Mauro Carvalho Chehab wrote: Em Mon, 17 Aug 2009 08:26:28 +0200 (CEST) Guennadi Liakhovetski g.liakhovet...@gmx.de escreveu: ...speaking about which, we should at some point start merging the soc-camera patch stack, which, however, requires some patches that are currently in next. Shall we pull those into the hg trees with the kernel-sync tag? Yes, that's fine. The only issue then is, that we will have to remember to push the patches to Linus in the 2.6.32 merge window after those 3 patches are there. The patches update 3 PXA platforms to the new soc-camera API. Ok. please put Priority: low on those patches. My scripts will put this at the pending tree, where I have already the DaVinci patches. They also have the same kind of restriction. So, I'll delay the pending -git tree to be sent after having the arch patches merged Ok, good, now, is there a git kernel tree to which I could rebase? If the current development tree is so far only available in hg, could you maybe push it into some git branch somewhere or just produce a patch series? Thanks Guennadi --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/ -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PULL] http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-core2
Em Mon, 24 Aug 2009 18:26:10 +0200 (CEST) Guennadi Liakhovetski g.liakhovet...@gmx.de escreveu: Hi Mauro On Sun, 23 Aug 2009, Mauro Carvalho Chehab wrote: Em Mon, 17 Aug 2009 08:26:28 +0200 (CEST) Guennadi Liakhovetski g.liakhovet...@gmx.de escreveu: ...speaking about which, we should at some point start merging the soc-camera patch stack, which, however, requires some patches that are currently in next. Shall we pull those into the hg trees with the kernel-sync tag? Yes, that's fine. The only issue then is, that we will have to remember to push the patches to Linus in the 2.6.32 merge window after those 3 patches are there. The patches update 3 PXA platforms to the new soc-camera API. Ok. please put Priority: low on those patches. My scripts will put this at the pending tree, where I have already the DaVinci patches. They also have the same kind of restriction. So, I'll delay the pending -git tree to be sent after having the arch patches merged Ok, good, now, is there a git kernel tree to which I could rebase? If the current development tree is so far only available in hg, could you maybe push it into some git branch somewhere or just produce a patch series? You may use my linux-next tree. Be warned that I almost always rebase it, due to our (broken) upstream proccess of using an -hg tree. I used to push also the devel tree upstream, but, as sometimes I was needing to rebase (less often than linux-next, but still often), I've dropped it, since rebasing is very bad for kernel.org mirrors, so I've minimized the problem by just pushing my trees when I'm about to ask a merge. Thanks Guennadi --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/ Cheers, Mauro -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PULL] http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-core2
Em Sun, 23 Aug 2009 21:35:29 +0200 Hans Verkuil hverk...@xs4all.nl escreveu: On Monday 17 August 2009 08:19:51 Hans Verkuil wrote: On Monday 17 August 2009 02:49:01 Mauro Carvalho Chehab wrote: Em Sat, 15 Aug 2009 11:18:20 +0200 Hans Verkuil hverk...@xs4all.nl escreveu: On Saturday 15 August 2009 10:59:19 Hans Verkuil wrote: On Tuesday 11 August 2009 08:35:47 Hans Verkuil wrote: Hi Mauro, Please pull from http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-core2 for the following: - v4l: simplify v4l2_i2c_new_subdev and friends - v4l: remove video_register_device_index The first patch simplifies v4l2_i2c_new_subdev and removes v4l2_i2c_new_probed_subdev and v4l2_i2c_new_probed_subdev_addr. This was initially proposed for inclusion in 2.6.31 but that was considered too soon. I think it is now a good time to merge this so this will go into 2.6.32. The second patch removes the unused video_register_device_index function. This patch is part of a larger series of patches I'm working on to improve v4l2-dev.c. But since this patch is pretty straightforward I like to get this one in first. Mauro, Please disregard this pull request. I've found a serious bug that needs to be resolved first. OK, that was a false alarm. It's working fine after all so it's safe to pull this tree. Sorry for the confusion. The patches look fine to me. Yet, I see two merge conflict issues: 1) if a latter patch needs to touch at the subdev probing sequence to fix a bug, it will conflict with this patch, meaning that we'll have merge troubles on this tree and at my -git devel, linux-next and linux-2.6; 2) as Guennadi is converting soc_camera to v4l2 dev/subdev, this patch may conflict with his patch series. Due to that, I prefer to keep holding it until the beginning of the next merge window, since, if a merge conflict would rise, it would be just at -hg, instead of having it at the 4 trees. I thought things were pretty stable by now since we reached -rc6. And we have seen no bugs at all with respect to the subdev API. The disadvantage of waiting that long is that this patch has had no testing in v4l-dvb but goes straight into the mainline. I personally prefer to have it in earlier so it gets a few weeks testing before the merge window opens. Anyway, that's just my opinion. In the meantime, can you at least merge the second patch (remove video_register_device_index)? I can make a new tree if you don't want to cherry-pick it. Hi Mauro, Do you want me to make a new tree, or can you cherry-pick? I would like to prepare some more core cleanups to make the code more understandable, but it's much easier to do that if this second patch is merged first. I did an effort to cleanup the patchwork patches on friday, since I wanted to merge everything else before this API change. There are still a few work there to be handled, but as far as I noticed, none will be affected by this series. Yet, I intend to handle the remaining ones before applying this series. The only pending work I'm aware of that could be affected are the Guennadi's patches. As we are already at -rc7, it is probably time to thing on merging this series. So, after receiving his series, I intend to merge this tree probably during this week. If you have any priority: high patch, please apply on another tree and ask me to pull Cheers, Mauro -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PULL] http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-core2
On Monday 17 August 2009 02:49:01 Mauro Carvalho Chehab wrote: Em Sat, 15 Aug 2009 11:18:20 +0200 Hans Verkuil hverk...@xs4all.nl escreveu: On Saturday 15 August 2009 10:59:19 Hans Verkuil wrote: On Tuesday 11 August 2009 08:35:47 Hans Verkuil wrote: Hi Mauro, Please pull from http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-core2 for the following: - v4l: simplify v4l2_i2c_new_subdev and friends - v4l: remove video_register_device_index The first patch simplifies v4l2_i2c_new_subdev and removes v4l2_i2c_new_probed_subdev and v4l2_i2c_new_probed_subdev_addr. This was initially proposed for inclusion in 2.6.31 but that was considered too soon. I think it is now a good time to merge this so this will go into 2.6.32. The second patch removes the unused video_register_device_index function. This patch is part of a larger series of patches I'm working on to improve v4l2-dev.c. But since this patch is pretty straightforward I like to get this one in first. Mauro, Please disregard this pull request. I've found a serious bug that needs to be resolved first. OK, that was a false alarm. It's working fine after all so it's safe to pull this tree. Sorry for the confusion. The patches look fine to me. Yet, I see two merge conflict issues: 1) if a latter patch needs to touch at the subdev probing sequence to fix a bug, it will conflict with this patch, meaning that we'll have merge troubles on this tree and at my -git devel, linux-next and linux-2.6; 2) as Guennadi is converting soc_camera to v4l2 dev/subdev, this patch may conflict with his patch series. Due to that, I prefer to keep holding it until the beginning of the next merge window, since, if a merge conflict would rise, it would be just at -hg, instead of having it at the 4 trees. I thought things were pretty stable by now since we reached -rc6. And we have seen no bugs at all with respect to the subdev API. The disadvantage of waiting that long is that this patch has had no testing in v4l-dvb but goes straight into the mainline. I personally prefer to have it in earlier so it gets a few weeks testing before the merge window opens. Anyway, that's just my opinion. In the meantime, can you at least merge the second patch (remove video_register_device_index)? I can make a new tree if you don't want to cherry-pick it. Regards, Hans -- Hans Verkuil - video4linux developer - sponsored by TANDBERG Telecom -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PULL] http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-core2
On Sun, 16 Aug 2009, Mauro Carvalho Chehab wrote: The patches look fine to me. Yet, I see two merge conflict issues: 1) if a latter patch needs to touch at the subdev probing sequence to fix a bug, it will conflict with this patch, meaning that we'll have merge troubles on this tree and at my -git devel, linux-next and linux-2.6; 2) as Guennadi is converting soc_camera to v4l2 dev/subdev, this patch may conflict with his patch series. ...speaking about which, we should at some point start merging the soc-camera patch stack, which, however, requires some patches that are currently in next. Shall we pull those into the hg trees with the kernel-sync tag? The only issue then is, that we will have to remember to push the patches to Linus in the 2.6.32 merge window after those 3 patches are there. The patches update 3 PXA platforms to the new soc-camera API. Due to that, I prefer to keep holding it until the beginning of the next merge window, since, if a merge conflict would rise, it would be just at -hg, instead of having it at the 4 trees. Thanks Guennadi --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/ -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PULL] http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-core2
Em Sat, 15 Aug 2009 11:18:20 +0200 Hans Verkuil hverk...@xs4all.nl escreveu: On Saturday 15 August 2009 10:59:19 Hans Verkuil wrote: On Tuesday 11 August 2009 08:35:47 Hans Verkuil wrote: Hi Mauro, Please pull from http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-core2 for the following: - v4l: simplify v4l2_i2c_new_subdev and friends - v4l: remove video_register_device_index The first patch simplifies v4l2_i2c_new_subdev and removes v4l2_i2c_new_probed_subdev and v4l2_i2c_new_probed_subdev_addr. This was initially proposed for inclusion in 2.6.31 but that was considered too soon. I think it is now a good time to merge this so this will go into 2.6.32. The second patch removes the unused video_register_device_index function. This patch is part of a larger series of patches I'm working on to improve v4l2-dev.c. But since this patch is pretty straightforward I like to get this one in first. Mauro, Please disregard this pull request. I've found a serious bug that needs to be resolved first. OK, that was a false alarm. It's working fine after all so it's safe to pull this tree. Sorry for the confusion. The patches look fine to me. Yet, I see two merge conflict issues: 1) if a latter patch needs to touch at the subdev probing sequence to fix a bug, it will conflict with this patch, meaning that we'll have merge troubles on this tree and at my -git devel, linux-next and linux-2.6; 2) as Guennadi is converting soc_camera to v4l2 dev/subdev, this patch may conflict with his patch series. Due to that, I prefer to keep holding it until the beginning of the next merge window, since, if a merge conflict would rise, it would be just at -hg, instead of having it at the 4 trees. Cheers, Mauro -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PULL] http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-core2
On Tuesday 11 August 2009 08:35:47 Hans Verkuil wrote: Hi Mauro, Please pull from http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-core2 for the following: - v4l: simplify v4l2_i2c_new_subdev and friends - v4l: remove video_register_device_index The first patch simplifies v4l2_i2c_new_subdev and removes v4l2_i2c_new_probed_subdev and v4l2_i2c_new_probed_subdev_addr. This was initially proposed for inclusion in 2.6.31 but that was considered too soon. I think it is now a good time to merge this so this will go into 2.6.32. The second patch removes the unused video_register_device_index function. This patch is part of a larger series of patches I'm working on to improve v4l2-dev.c. But since this patch is pretty straightforward I like to get this one in first. Mauro, Please disregard this pull request. I've found a serious bug that needs to be resolved first. Regards, Hans Thanks, Hans diffstat: Documentation/video4linux/v4l2-framework.txt | 33 + drivers/media/video/au0828/au0828-cards.c |4 drivers/media/video/bt8xx/bttv-cards.c| 44 +++ drivers/media/video/cafe_ccic.c |2 drivers/media/video/cx18/cx18-i2c.c | 14 +- drivers/media/video/cx231xx/cx231xx-cards.c |4 drivers/media/video/cx23885/cx23885-cards.c |2 drivers/media/video/cx23885/cx23885-video.c |6 drivers/media/video/cx88/cx88-cards.c | 14 +- drivers/media/video/cx88/cx88-video.c |6 drivers/media/video/davinci/vpif_display.c|4 drivers/media/video/em28xx/em28xx-cards.c | 34 ++--- drivers/media/video/ivtv/ivtv-i2c.c | 18 +- drivers/media/video/mxb.c | 14 +- drivers/media/video/pvrusb2/pvrusb2-hdw.c | 10 - drivers/media/video/saa7134/saa7134-cards.c | 12 - drivers/media/video/saa7134/saa7134-core.c|6 drivers/media/video/usbvision/usbvision-i2c.c | 12 - drivers/media/video/v4l2-common.c | 157 -- drivers/media/video/v4l2-dev.c| 55 ++--- drivers/media/video/vino.c|8 - drivers/media/video/w9968cf.c |4 drivers/media/video/zoran/zoran_card.c|8 - include/media/v4l2-common.h | 30 +--- include/media/v4l2-dev.h |2 25 files changed, 151 insertions(+), 352 deletions(-) -- Hans Verkuil - video4linux developer - sponsored by TANDBERG Telecom -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PULL] http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-core2
On Saturday 15 August 2009 10:59:19 Hans Verkuil wrote: On Tuesday 11 August 2009 08:35:47 Hans Verkuil wrote: Hi Mauro, Please pull from http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-core2 for the following: - v4l: simplify v4l2_i2c_new_subdev and friends - v4l: remove video_register_device_index The first patch simplifies v4l2_i2c_new_subdev and removes v4l2_i2c_new_probed_subdev and v4l2_i2c_new_probed_subdev_addr. This was initially proposed for inclusion in 2.6.31 but that was considered too soon. I think it is now a good time to merge this so this will go into 2.6.32. The second patch removes the unused video_register_device_index function. This patch is part of a larger series of patches I'm working on to improve v4l2-dev.c. But since this patch is pretty straightforward I like to get this one in first. Mauro, Please disregard this pull request. I've found a serious bug that needs to be resolved first. OK, that was a false alarm. It's working fine after all so it's safe to pull this tree. Sorry for the confusion. Regards, Hans -- Hans Verkuil - video4linux developer - sponsored by TANDBERG Telecom -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PULL] http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-core2
Hi Mauro, Please pull from http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-core2 for the following: - v4l: simplify v4l2_i2c_new_subdev and friends - v4l: remove video_register_device_index The first patch simplifies v4l2_i2c_new_subdev and removes v4l2_i2c_new_probed_subdev and v4l2_i2c_new_probed_subdev_addr. This was initially proposed for inclusion in 2.6.31 but that was considered too soon. I think it is now a good time to merge this so this will go into 2.6.32. The second patch removes the unused video_register_device_index function. This patch is part of a larger series of patches I'm working on to improve v4l2-dev.c. But since this patch is pretty straightforward I like to get this one in first. Thanks, Hans diffstat: Documentation/video4linux/v4l2-framework.txt | 33 + drivers/media/video/au0828/au0828-cards.c |4 drivers/media/video/bt8xx/bttv-cards.c| 44 +++ drivers/media/video/cafe_ccic.c |2 drivers/media/video/cx18/cx18-i2c.c | 14 +- drivers/media/video/cx231xx/cx231xx-cards.c |4 drivers/media/video/cx23885/cx23885-cards.c |2 drivers/media/video/cx23885/cx23885-video.c |6 drivers/media/video/cx88/cx88-cards.c | 14 +- drivers/media/video/cx88/cx88-video.c |6 drivers/media/video/davinci/vpif_display.c|4 drivers/media/video/em28xx/em28xx-cards.c | 34 ++--- drivers/media/video/ivtv/ivtv-i2c.c | 18 +- drivers/media/video/mxb.c | 14 +- drivers/media/video/pvrusb2/pvrusb2-hdw.c | 10 - drivers/media/video/saa7134/saa7134-cards.c | 12 - drivers/media/video/saa7134/saa7134-core.c|6 drivers/media/video/usbvision/usbvision-i2c.c | 12 - drivers/media/video/v4l2-common.c | 157 -- drivers/media/video/v4l2-dev.c| 55 ++--- drivers/media/video/vino.c|8 - drivers/media/video/w9968cf.c |4 drivers/media/video/zoran/zoran_card.c|8 - include/media/v4l2-common.h | 30 +--- include/media/v4l2-dev.h |2 25 files changed, 151 insertions(+), 352 deletions(-) -- Hans Verkuil - video4linux developer - sponsored by TANDBERG Telecom -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
