Re: [GIT PULL FOR v3.19] uvcvideo changes
Hi Mauro, On Tuesday 11 November 2014 08:56:26 Mauro Carvalho Chehab wrote: Em Fri, 07 Nov 2014 08:16:28 +0200 Laurent Pinchart escreveu: Hi Mauro, The following changes since commit 4895cc47a072dcb32d3300d0a46a251a8c6db5f1: [media] s5p-mfc: fix sparse error (2014-11-05 08:29:27 -0200) are available in the git repository at: git://linuxtv.org/pinchartl/media.git remotes/media/uvc/next It seems that there's something weird with this URL... remotes git isn't playing nicely :-/ I've pushed the changes to the uvc/next branch on git://linuxtv.org/pinchartl/media.git, up to commit a1bee5f9f606. http://git.linuxtv.org/cgit.cgi/pinchartl/media.git/commit/?h=uvc/next confirms that everything is in order. However, running git request-pull local-linuxtv-master media remotes/media/uvc/next with the media remote pointing to git://linuxtv.org/pinchartl/media.git generates -- warn: No match for commit a1bee5f9f606f89ff30171658a82bf532cca7f3d found at git://linuxtv.org/pinchartl/media.git warn: Are you sure you pushed 'remotes/media/uvc/next' there? The following changes since commit 4895cc47a072dcb32d3300d0a46a251a8c6db5f1: [media] s5p-mfc: fix sparse error (2014-11-05 08:29:27 -0200) are available in the git repository at: git://linuxtv.org/pinchartl/media.git remotes/media/uvc/next for you to fetch changes up to a1bee5f9f606f89ff30171658a82bf532cca7f3d: uvcvideo: Return all buffers to vb2 at stream stop and start failure (2014-11-07 08:13:21 +0200) -- For some reason git can't find the remote branch (hence the warning) and thus generates the URL line incorrectly. I've tried upgrading from git 2.0.4 to git 2.1.3 but the problem is still present. Creating a local branch named uvc/next fixes the problem. I wonder if I'm doing something really stupid or if it's a git bug. Can you pull from git://linuxtv.org/pinchartl/media.git uvc/next ? I haven't updated the branch since I've sent the last pull request. -- Regards, Laurent Pinchart -- 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: [GIT PULL FOR v3.19] uvcvideo changes
Em Mon, 24 Nov 2014 11:06:49 +0200 Laurent Pinchart laurent.pinch...@ideasonboard.com escreveu: Hi Mauro, On Tuesday 11 November 2014 08:56:26 Mauro Carvalho Chehab wrote: Em Fri, 07 Nov 2014 08:16:28 +0200 Laurent Pinchart escreveu: Hi Mauro, The following changes since commit 4895cc47a072dcb32d3300d0a46a251a8c6db5f1: [media] s5p-mfc: fix sparse error (2014-11-05 08:29:27 -0200) are available in the git repository at: git://linuxtv.org/pinchartl/media.git remotes/media/uvc/next It seems that there's something weird with this URL... remotes git isn't playing nicely :-/ I've pushed the changes to the uvc/next branch on git://linuxtv.org/pinchartl/media.git, up to commit a1bee5f9f606. http://git.linuxtv.org/cgit.cgi/pinchartl/media.git/commit/?h=uvc/next confirms that everything is in order. However, running git request-pull local-linuxtv-master media remotes/media/uvc/next Seriously? Do you want git to change remotes? I don't think you can do that. The remotes branches are to track something remote, e. g. the references there should be already at the remote tree. You should, instead, create a local branch and push it upstream. with the media remote pointing to git://linuxtv.org/pinchartl/media.git generates -- warn: No match for commit a1bee5f9f606f89ff30171658a82bf532cca7f3d found at git://linuxtv.org/pinchartl/media.git warn: Are you sure you pushed 'remotes/media/uvc/next' there? The following changes since commit 4895cc47a072dcb32d3300d0a46a251a8c6db5f1: [media] s5p-mfc: fix sparse error (2014-11-05 08:29:27 -0200) are available in the git repository at: git://linuxtv.org/pinchartl/media.git remotes/media/uvc/next for you to fetch changes up to a1bee5f9f606f89ff30171658a82bf532cca7f3d: uvcvideo: Return all buffers to vb2 at stream stop and start failure (2014-11-07 08:13:21 +0200) -- For some reason git can't find the remote branch (hence the warning) and thus generates the URL line incorrectly. I've tried upgrading from git 2.0.4 to git 2.1.3 but the problem is still present. Creating a local branch named uvc/next fixes the problem. Yes, that's the right thing to do. Only modify local branches. Git considers that the branches under remotes/* will be handled by it. If you ever do a git remote update. You'll see that git will override all references that are on a remote branch and you'll loose your work! I think that even git revlog won't help you to recover the missing heads, as it won't track branches under remotes/*. I wonder if I'm doing something really stupid or if it's a git bug. Well, git is right. You should not use remotes/foo for the branches you're modifying. Such namespace is reserved for git to be able to track the upstream branches. Can you pull from git://linuxtv.org/pinchartl/media.git uvc/next Sure, I'll do it along this week. ? I haven't updated the branch since I've sent the last pull request. Regards, 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: [GIT PULL FOR v3.19] uvcvideo changes
Hi Mauro, On Monday 24 November 2014 08:12:11 Mauro Carvalho Chehab wrote: Em Mon, 24 Nov 2014 11:06:49 +0200 Laurent Pinchart escreveu: On Tuesday 11 November 2014 08:56:26 Mauro Carvalho Chehab wrote: Em Fri, 07 Nov 2014 08:16:28 +0200 Laurent Pinchart escreveu: Hi Mauro, The following changes since commit 4895cc47a072dcb32d3300d0a46a251a8c6db5f1: [media] s5p-mfc: fix sparse error (2014-11-05 08:29:27 -0200) are available in the git repository at: git://linuxtv.org/pinchartl/media.git remotes/media/uvc/next It seems that there's something weird with this URL... remotes git isn't playing nicely :-/ I've pushed the changes to the uvc/next branch on git://linuxtv.org/pinchartl/media.git, up to commit a1bee5f9f606. http://git.linuxtv.org/cgit.cgi/pinchartl/media.git/commit/?h=uvc/next confirms that everything is in order. However, running git request-pull local-linuxtv-master media remotes/media/uvc/next Seriously? Do you want git to change remotes? I don't think you can do that. The remotes branches are to track something remote, e. g. the references there should be already at the remote tree. I don't want git to change remotes, I want git to react to what is in the remote tree. For historical reasons my local branch is named uvcvideo/next, while the remote branch is named uvc/next. They both point to the same commit. Before upgrading to git v2.0.4 running git request-pull local-linuxtv-master media remotes/media/uvc/next would not incorrectly warn that the commit ID isn't available remotely (as it is available) and would produce the git URL git://linuxtv.org/pinchartl/media.git uvc/next You should, instead, create a local branch and push it upstream. I've done that, the problem is that the local and remote branches have different names. I should of course have read the latest git-request-pull man page and run git request-pull local-linuxtv-master media uvcvideo/next:uvc/next That works fine. with the media remote pointing to git://linuxtv.org/pinchartl/media.git generates -- warn: No match for commit a1bee5f9f606f89ff30171658a82bf532cca7f3d found at git://linuxtv.org/pinchartl/media.git warn: Are you sure you pushed 'remotes/media/uvc/next' there? The following changes since commit 4895cc47a072dcb32d3300d0a46a251a8c6db5f1: [media] s5p-mfc: fix sparse error (2014-11-05 08:29:27 -0200) are available in the git repository at: git://linuxtv.org/pinchartl/media.git remotes/media/uvc/next for you to fetch changes up to a1bee5f9f606f89ff30171658a82bf532cca7f3d: uvcvideo: Return all buffers to vb2 at stream stop and start failure (2014-11-07 08:13:21 +0200) -- For some reason git can't find the remote branch (hence the warning) and thus generates the URL line incorrectly. I've tried upgrading from git 2.0.4 to git 2.1.3 but the problem is still present. Creating a local branch named uvc/next fixes the problem. Yes, that's the right thing to do. Only modify local branches. Git considers that the branches under remotes/* will be handled by it. If you ever do a git remote update. You'll see that git will override all references that are on a remote branch and you'll loose your work! I think that even git revlog won't help you to recover the missing heads, as it won't track branches under remotes/*. I wonder if I'm doing something really stupid or if it's a git bug. Well, git is right. You should not use remotes/foo for the branches you're modifying. Such namespace is reserved for git to be able to track the upstream branches. Can you pull from git://linuxtv.org/pinchartl/media.git uvc/next Sure, I'll do it along this week. Thank you. ? I haven't updated the branch since I've sent the last pull request. -- Regards, Laurent Pinchart -- 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: [GIT PULL FOR v3.19] uvcvideo changes
Em Mon, 24 Nov 2014 12:41:10 +0200 Laurent Pinchart laurent.pinch...@ideasonboard.com escreveu: Hi Mauro, On Monday 24 November 2014 08:12:11 Mauro Carvalho Chehab wrote: Em Mon, 24 Nov 2014 11:06:49 +0200 Laurent Pinchart escreveu: On Tuesday 11 November 2014 08:56:26 Mauro Carvalho Chehab wrote: Em Fri, 07 Nov 2014 08:16:28 +0200 Laurent Pinchart escreveu: Hi Mauro, The following changes since commit 4895cc47a072dcb32d3300d0a46a251a8c6db5f1: [media] s5p-mfc: fix sparse error (2014-11-05 08:29:27 -0200) are available in the git repository at: git://linuxtv.org/pinchartl/media.git remotes/media/uvc/next It seems that there's something weird with this URL... remotes git isn't playing nicely :-/ I've pushed the changes to the uvc/next branch on git://linuxtv.org/pinchartl/media.git, up to commit a1bee5f9f606. http://git.linuxtv.org/cgit.cgi/pinchartl/media.git/commit/?h=uvc/next confirms that everything is in order. However, running git request-pull local-linuxtv-master media remotes/media/uvc/next Seriously? Do you want git to change remotes? I don't think you can do that. The remotes branches are to track something remote, e. g. the references there should be already at the remote tree. I don't want git to change remotes, I want git to react to what is in the remote tree. For historical reasons my local branch is named uvcvideo/next, while the remote branch is named uvc/next. They both point to the same commit. Before upgrading to git v2.0.4 running git request-pull local-linuxtv-master media remotes/media/uvc/next would not incorrectly warn that the commit ID isn't available remotely (as it is available) and would produce the git URL git://linuxtv.org/pinchartl/media.git uvc/next The right syntax would be to use, instead: git request-pull git://linuxtv.org/pinchartl/media.git uvcvideo/next You should, instead, create a local branch and push it upstream. I've done that, the problem is that the local and remote branches have different names. No problem. Git request-pull would automatically detect the remote branch that has the changeset associated with the local branch that you're requesting to pull. It probably uses the push config at your .git/config. The names I use on my local repository also don't match the ones at the public repository. I should of course have read the latest git-request-pull man page and run git request-pull local-linuxtv-master media uvcvideo/next:uvc/next That works fine. Yeah, you could force it, but no need if your .git/config has already a push line like the above. with the media remote pointing to git://linuxtv.org/pinchartl/media.git generates -- warn: No match for commit a1bee5f9f606f89ff30171658a82bf532cca7f3d found at git://linuxtv.org/pinchartl/media.git warn: Are you sure you pushed 'remotes/media/uvc/next' there? The following changes since commit 4895cc47a072dcb32d3300d0a46a251a8c6db5f1: [media] s5p-mfc: fix sparse error (2014-11-05 08:29:27 -0200) are available in the git repository at: git://linuxtv.org/pinchartl/media.git remotes/media/uvc/next for you to fetch changes up to a1bee5f9f606f89ff30171658a82bf532cca7f3d: uvcvideo: Return all buffers to vb2 at stream stop and start failure (2014-11-07 08:13:21 +0200) -- For some reason git can't find the remote branch (hence the warning) and thus generates the URL line incorrectly. I've tried upgrading from git 2.0.4 to git 2.1.3 but the problem is still present. Creating a local branch named uvc/next fixes the problem. Yes, that's the right thing to do. Only modify local branches. Git considers that the branches under remotes/* will be handled by it. If you ever do a git remote update. You'll see that git will override all references that are on a remote branch and you'll loose your work! I think that even git revlog won't help you to recover the missing heads, as it won't track branches under remotes/*. I wonder if I'm doing something really stupid or if it's a git bug. Well, git is right. You should not use remotes/foo for the branches you're modifying. Such namespace is reserved for git to be able to track the upstream branches. Can you pull from git://linuxtv.org/pinchartl/media.git uvc/next Sure, I'll do it along this week. Thank you. ? I haven't updated the branch since I've sent the last pull request. -- 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: [GIT PULL FOR v3.19] uvcvideo changes
Hi Mauro, On Monday 24 November 2014 08:59:23 Mauro Carvalho Chehab wrote: Em Mon, 24 Nov 2014 12:41:10 +0200 Laurent Pinchart escreveu: On Monday 24 November 2014 08:12:11 Mauro Carvalho Chehab wrote: Em Mon, 24 Nov 2014 11:06:49 +0200 Laurent Pinchart escreveu: On Tuesday 11 November 2014 08:56:26 Mauro Carvalho Chehab wrote: Em Fri, 07 Nov 2014 08:16:28 +0200 Laurent Pinchart escreveu: Hi Mauro, The following changes since commit 4895cc47a072dcb32d3300d0a46a251a8c6db5f1: [media] s5p-mfc: fix sparse error (2014-11-05 08:29:27 -0200) are available in the git repository at: git://linuxtv.org/pinchartl/media.git remotes/media/uvc/next It seems that there's something weird with this URL... remotes git isn't playing nicely :-/ I've pushed the changes to the uvc/next branch on git://linuxtv.org/pinchartl/media.git, up to commit a1bee5f9f606. http://git.linuxtv.org/cgit.cgi/pinchartl/media.git/commit/?h=uvc/next confirms that everything is in order. However, running git request-pull local-linuxtv-master media remotes/media/uvc/next Seriously? Do you want git to change remotes? I don't think you can do that. The remotes branches are to track something remote, e. g. the references there should be already at the remote tree. I don't want git to change remotes, I want git to react to what is in the remote tree. For historical reasons my local branch is named uvcvideo/next, while the remote branch is named uvc/next. They both point to the same commit. Before upgrading to git v2.0.4 running git request-pull local-linuxtv-master media remotes/media/uvc/next would not incorrectly warn that the commit ID isn't available remotely (as it is available) and would produce the git URL git://linuxtv.org/pinchartl/media.git uvc/next The right syntax would be to use, instead: git request-pull git://linuxtv.org/pinchartl/media.git uvcvideo/next That produces warn: No match for commit a1bee5f9f606f89ff30171658a82bf532cca7f3d found at media warn: Are you sure you pushed 'uvcvideo/next' there? The following changes since commit 4895cc47a072dcb32d3300d0a46a251a8c6db5f1: [media] s5p-mfc: fix sparse error (2014-11-05 08:29:27 -0200) are available in the git repository at: git://linuxtv.org/pinchartl/media.git uvcvideo/next for you to fetch changes up to a1bee5f9f606f89ff30171658a82bf532cca7f3d: uvcvideo: Return all buffers to vb2 at stream stop and start failure (2014-11-07 08:13:21 +0200) You should, instead, create a local branch and push it upstream. I've done that, the problem is that the local and remote branches have different names. No problem. Git request-pull would automatically detect the remote branch that has the changeset associated with the local branch that you're requesting to pull. It probably uses the push config at your .git/config. It seems like it did before I upgraded to 2.0.4, but not anymore. The names I use on my local repository also don't match the ones at the public repository. I should of course have read the latest git-request-pull man page and run git request-pull local-linuxtv-master media uvcvideo/next:uvc/next That works fine. Yeah, you could force it, but no need if your .git/config has already a push line like the above. [snip] -- Regards, Laurent Pinchart -- 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: [GIT PULL FOR v3.19] uvcvideo changes
Em Fri, 07 Nov 2014 08:16:28 +0200 Laurent Pinchart laurent.pinch...@ideasonboard.com escreveu: Hi Mauro, The following changes since commit 4895cc47a072dcb32d3300d0a46a251a8c6db5f1: [media] s5p-mfc: fix sparse error (2014-11-05 08:29:27 -0200) are available in the git repository at: git://linuxtv.org/pinchartl/media.git remotes/media/uvc/next It seems that there's something weird with this URL... remotes Regards, 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
[GIT PULL FOR v3.19] uvcvideo changes
Hi Mauro, The following changes since commit 4895cc47a072dcb32d3300d0a46a251a8c6db5f1: [media] s5p-mfc: fix sparse error (2014-11-05 08:29:27 -0200) are available in the git repository at: git://linuxtv.org/pinchartl/media.git remotes/media/uvc/next for you to fetch changes up to a1bee5f9f606f89ff30171658a82bf532cca7f3d: uvcvideo: Return all buffers to vb2 at stream stop and start failure (2014-11-07 08:13:21 +0200) The v4l2: get/set prio using video_dev prio structure patch hasn't been acked yet. I'm leaving now for two weeks of holidays and I would like to avoid missing the merge window, so I'd appreciate if someone (Hans ? :-)) could review it in my absence and ack the pull request. If it needs to be delayed for some reason, could the first two patches (from Philipp and Takashi) still get in ? Laurent Pinchart (10): v4l2: get/set prio using video_dev prio structure uvcvideo: Move to video_ioctl2 uvcvideo: Set buffer field to V4L2_FIELD_NONE uvcvideo: Separate video and queue enable/disable operations uvcvideo: Add function to convert from queue to stream uvcvideo: Implement vb2 queue start and stop stream operations uvcvideo: Don't stop the stream twice at file handle release uvcvideo: Rename uvc_alloc_buffers to uvc_request_buffers uvcvideo: Rename and split uvc_queue_enable to uvc_queue_stream(on|off) uvcvideo: Return all buffers to vb2 at stream stop and start failure Philipp Zabel (1): uvcvideo: Add quirk to force the Oculus DK2 IR tracker to grayscale Takashi Iwai (1): uvcvideo: Fix destruction order in uvc_delete() drivers/media/usb/uvc/uvc_driver.c | 51 ++- drivers/media/usb/uvc/uvc_queue.c| 161 --- drivers/media/usb/uvc/uvc_v4l2.c | 1009 +++-- drivers/media/usb/uvc/uvc_video.c| 23 +- drivers/media/usb/uvc/uvcvideo.h | 12 +- drivers/media/v4l2-core/v4l2-ioctl.c |4 +- 6 files changed, 705 insertions(+), 555 deletions(-) -- Regards, Laurent Pinchart -- 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
