| Message ID | 20230605183025.GA22339@pendragon.ideasonboard.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [GIT,PULL,FOR,v6.5] uvcvideo changes | expand |
From: builder@linuxtv.org
Pull request: https://patchwork.linuxtv.org/project/linux-media/patch/20230605183025.GA22339@pendragon.ideasonboard.com/
Build log: https://builder.linuxtv.org/job/patchwork/312203/
Build time: 00:00:00
Link: https://lore.kernel.org/linux-media/20230605183025.GA22339@pendragon.ideasonboard.com
gpg: Signature made Mon 05 Jun 2023 03:47:56 PM UTC
gpg: using EDDSA key C09EF871B3827B413F971CA9CC3F2D800327DE64
gpg: issuer "laurent.pinchart@ideasonboard.com"
gpg: Can't check signature: No public key
Build aborted due to a fatal error:
FAILED: patch patch patches/0002-media-uapi-v4l-Intel-metadata-format-update.patch doesn't apply:
Applying patch patches/0002-media-uapi-v4l-Intel-metadata-format-update.patch
can't find file to patch at input line 21
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From 21ebf0d82515edf8bdbd489e6bfe9fe413e56ae3 Mon Sep 17 00:00:00 2001
|From: Dmitry Perchanov <dmitry.perchanov@intel.com>
|Date: Thu, 1 Jun 2023 19:08:46 +0300
|Subject: media: uapi: v4l: Intel metadata format update
|
|Update metadata structure for Intel RealSense UVC/MIPI cameras.
|Compliant to Intel Configuration version 3.
|
|Signed-off-by: Dmitry Perchanov <dmitry.perchanov@intel.com>
|Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com>
|Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|---
| .../media/v4l/pixfmt-meta-d4xx.rst | 55 ++++++++++++++++---
| 1 file changed, 47 insertions(+), 8 deletions(-)
|
|diff --git a/Documentation/userspace-api/media/v4l/pixfmt-meta-d4xx.rst b/Documentation/userspace-api/media/v4l/pixfmt-meta-d4xx.rst
|index 4e437ba97a0e..541836074f94 100644
|--- a/Documentation/userspace-api/media/v4l/pixfmt-meta-d4xx.rst
|+++ b/Documentation/userspace-api/media/v4l/pixfmt-meta-d4xx.rst
--------------------------
No file to patch. Skipping patch.
9 out of 9 hunks ignored
Patch patches/0002-media-uapi-v4l-Intel-metadata-format-update.patch does not apply (enforce with -f)
Hi Laurent, There is path mistake for patch: media: uapi: v4l: Intel metadata format update Probably pull request was misformated. It is submitted with correct path and I fetched your tag and file is in place. Thanks for your patience. Dmitry P. On Mon, 2023-06-05 at 21:30 +0300, Laurent Pinchart wrote: > Hi Mauro, > > The following changes since commit 9561de3a55bed6bdd44a12820ba81ec416e705a7: > > Linux 6.4-rc5 (2023-06-04 14:04:27 -0400) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/pinchartl/linux.git tags/media-uvc-next-20230606 > > for you to fetch changes up to 9bfc8e4d0972d3732bd8c6038c2bf1636780d727: > > media: uvcvideo: Constify descriptor buffers (2023-06-05 18:39:47 +0300) > > Please note that this pull request is based on v6.4-rc5 as it depends on > a fix that was merged in that version. > > ---------------------------------------------------------------- > Miscellaneous uvcvideo changes: > > - Support for more Intel RealSense devices > - Small cleanups and constifications > - Drop duplicate device > > ---------------------------------------------------------------- > Dmitry Perchanov (2): > media: uapi: v4l: Intel metadata format update > media: uvcvideo: Enable Intel RealSense metadata for devices > > Laurent Pinchart (7): > media: uvcvideo: Rename uvc_streaming 'format' field to 'formats' > media: uvcvideo: Rename uvc_format 'frame' field to 'frames' > media: uvcvideo: Use clamp() to replace manual implementation > media: uvcvideo: Reorganize format descriptor parsing > media: uvcvideo: Increment intervals pointer at end of parsing > media: uvcvideo: Constify formats, frames and intervals > media: uvcvideo: Constify descriptor buffers > > Sakari Ailus (1): > Revert "media: uvcvideo: Limit power line control for Acer EasyCamera" > > .../userspace-api/media/v4l/pixfmt-meta-d4xx.rst | 55 +++++++-- This path above is incorrect. > drivers/media/usb/uvc/uvc_driver.c | 137 ++++++++++++++++----- > drivers/media/usb/uvc/uvc_v4l2.c | 79 ++++++------ > drivers/media/usb/uvc/uvc_video.c | 20 +-- > drivers/media/usb/uvc/uvcvideo.h | 12 +- > 5 files changed, 208 insertions(+), 95 deletions(-) > > --------------------------------------------------------------------- Intel Israel (74) Limited This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.
Hi Dmitry, On Wed, Jun 07, 2023 at 08:21:18PM +0300, Dmitry Perchanov wrote: > Hi Laurent, > > There is path mistake for patch: > media: uapi: v4l: Intel metadata format update > > Probably pull request was misformated. > > It is submitted with correct path and I fetched your tag and file is > in place. > > Thanks for your patience. > > Dmitry P. > > On Mon, 2023-06-05 at 21:30 +0300, Laurent Pinchart wrote: > > Hi Mauro, > > > > The following changes since commit 9561de3a55bed6bdd44a12820ba81ec416e705a7: > > > > Linux 6.4-rc5 (2023-06-04 14:04:27 -0400) > > > > are available in the Git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/pinchartl/linux.git tags/media-uvc-next-20230606 > > > > for you to fetch changes up to 9bfc8e4d0972d3732bd8c6038c2bf1636780d727: > > > > media: uvcvideo: Constify descriptor buffers (2023-06-05 18:39:47 +0300) > > > > Please note that this pull request is based on v6.4-rc5 as it depends on > > a fix that was merged in that version. > > > > ---------------------------------------------------------------- > > Miscellaneous uvcvideo changes: > > > > - Support for more Intel RealSense devices > > - Small cleanups and constifications > > - Drop duplicate device > > > > ---------------------------------------------------------------- > > Dmitry Perchanov (2): > > media: uapi: v4l: Intel metadata format update > > media: uvcvideo: Enable Intel RealSense metadata for devices > > > > Laurent Pinchart (7): > > media: uvcvideo: Rename uvc_streaming 'format' field to 'formats' > > media: uvcvideo: Rename uvc_format 'frame' field to 'frames' > > media: uvcvideo: Use clamp() to replace manual implementation > > media: uvcvideo: Reorganize format descriptor parsing > > media: uvcvideo: Increment intervals pointer at end of parsing > > media: uvcvideo: Constify formats, frames and intervals > > media: uvcvideo: Constify descriptor buffers > > > > Sakari Ailus (1): > > Revert "media: uvcvideo: Limit power line control for Acer EasyCamera" > > > > .../userspace-api/media/v4l/pixfmt-meta-d4xx.rst | 55 +++++++-- > > This path above is incorrect. git shortens long lines by removing the left-most parts of the path and replacing it with '...'. The file is in Documentation/userspace-api/media/v4l/pixfmt-meta-d4xx.rst, it's only the shortlog that shows the shortened path. > > drivers/media/usb/uvc/uvc_driver.c | 137 ++++++++++++++++----- > > drivers/media/usb/uvc/uvc_v4l2.c | 79 ++++++------ > > drivers/media/usb/uvc/uvc_video.c | 20 +-- > > drivers/media/usb/uvc/uvcvideo.h | 12 +- > > 5 files changed, 208 insertions(+), 95 deletions(-)
Hi Laurent, I saw that Jenkins failed to apply this patch.. > FAILED: patch patch patches/0002-media-uapi-v4l-Intel-metadata-format-update.patch doesn't apply: > Applying patch patches/0002-media-uapi-v4l-Intel-metadata-format-update.patch > can't find file to patch at input line 21 ¯\_(O_o)_/¯ Regards, Dmitry P. On Wed, 2023-06-07 at 20:27 +0300, Laurent Pinchart wrote: > Hi Dmitry, > > On Wed, Jun 07, 2023 at 08:21:18PM +0300, Dmitry Perchanov wrote: > > Hi Laurent, > > > > There is path mistake for patch: > > media: uapi: v4l: Intel metadata format update > > > > Probably pull request was misformated. > > > > It is submitted with correct path and I fetched your tag and file is > > in place. > > > > Thanks for your patience. > > > > Dmitry P. > > > > On Mon, 2023-06-05 at 21:30 +0300, Laurent Pinchart wrote: > > > Hi Mauro, > > > > > > The following changes since commit 9561de3a55bed6bdd44a12820ba81ec416e705a7: > > > > > > Linux 6.4-rc5 (2023-06-04 14:04:27 -0400) > > > > > > are available in the Git repository at: > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/pinchartl/linux.git tags/media-uvc-next-20230606 > > > > > > for you to fetch changes up to 9bfc8e4d0972d3732bd8c6038c2bf1636780d727: > > > > > > media: uvcvideo: Constify descriptor buffers (2023-06-05 18:39:47 +0300) > > > > > > Please note that this pull request is based on v6.4-rc5 as it depends on > > > a fix that was merged in that version. > > > > > > ---------------------------------------------------------------- > > > Miscellaneous uvcvideo changes: > > > > > > - Support for more Intel RealSense devices > > > - Small cleanups and constifications > > > - Drop duplicate device > > > > > > ---------------------------------------------------------------- > > > Dmitry Perchanov (2): > > > media: uapi: v4l: Intel metadata format update > > > media: uvcvideo: Enable Intel RealSense metadata for devices > > > > > > Laurent Pinchart (7): > > > media: uvcvideo: Rename uvc_streaming 'format' field to 'formats' > > > media: uvcvideo: Rename uvc_format 'frame' field to 'frames' > > > media: uvcvideo: Use clamp() to replace manual implementation > > > media: uvcvideo: Reorganize format descriptor parsing > > > media: uvcvideo: Increment intervals pointer at end of parsing > > > media: uvcvideo: Constify formats, frames and intervals > > > media: uvcvideo: Constify descriptor buffers > > > > > > Sakari Ailus (1): > > > Revert "media: uvcvideo: Limit power line control for Acer EasyCamera" > > > > > > .../userspace-api/media/v4l/pixfmt-meta-d4xx.rst | 55 +++++++-- > > > > This path above is incorrect. > > git shortens long lines by removing the left-most parts of the path and > replacing it with '...'. The file is in > Documentation/userspace-api/media/v4l/pixfmt-meta-d4xx.rst, it's only > the shortlog that shows the shortened path. > > > > drivers/media/usb/uvc/uvc_driver.c | 137 ++++++++++++++++----- > > > drivers/media/usb/uvc/uvc_v4l2.c | 79 ++++++------ > > > drivers/media/usb/uvc/uvc_video.c | 20 +-- > > > drivers/media/usb/uvc/uvcvideo.h | 12 +- > > > 5 files changed, 208 insertions(+), 95 deletions(-) --------------------------------------------------------------------- Intel Israel (74) Limited This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.
On Wed, Jun 07, 2023 at 08:47:38PM +0300, Dmitry Perchanov wrote: > Hi Laurent, > I saw that Jenkins failed to apply this patch.. > > > FAILED: patch patch patches/0002-media-uapi-v4l-Intel-metadata-format-update.patch doesn't apply: > > Applying patch patches/0002-media-uapi-v4l-Intel-metadata-format-update.patch > > can't find file to patch at input line 21 > > ¯\_(O_o)_/¯ I suspect Jenkins may be trying to apply the patch to the wrong branch. It's hard to tell, as the build log link in the failure report (https://builder.linuxtv.org/job/patchwork/312203/) doesn't work. I expect Mauro will look at this. > On Wed, 2023-06-07 at 20:27 +0300, Laurent Pinchart wrote: > > On Wed, Jun 07, 2023 at 08:21:18PM +0300, Dmitry Perchanov wrote: > > > Hi Laurent, > > > > > > There is path mistake for patch: > > > media: uapi: v4l: Intel metadata format update > > > > > > Probably pull request was misformated. > > > > > > It is submitted with correct path and I fetched your tag and file is > > > in place. > > > > > > Thanks for your patience. > > > > > > Dmitry P. > > > > > > On Mon, 2023-06-05 at 21:30 +0300, Laurent Pinchart wrote: > > > > Hi Mauro, > > > > > > > > The following changes since commit 9561de3a55bed6bdd44a12820ba81ec416e705a7: > > > > > > > > Linux 6.4-rc5 (2023-06-04 14:04:27 -0400) > > > > > > > > are available in the Git repository at: > > > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/pinchartl/linux.git tags/media-uvc-next-20230606 > > > > > > > > for you to fetch changes up to 9bfc8e4d0972d3732bd8c6038c2bf1636780d727: > > > > > > > > media: uvcvideo: Constify descriptor buffers (2023-06-05 18:39:47 +0300) > > > > > > > > Please note that this pull request is based on v6.4-rc5 as it depends on > > > > a fix that was merged in that version. > > > > > > > > ---------------------------------------------------------------- > > > > Miscellaneous uvcvideo changes: > > > > > > > > - Support for more Intel RealSense devices > > > > - Small cleanups and constifications > > > > - Drop duplicate device > > > > > > > > ---------------------------------------------------------------- > > > > Dmitry Perchanov (2): > > > > media: uapi: v4l: Intel metadata format update > > > > media: uvcvideo: Enable Intel RealSense metadata for devices > > > > > > > > Laurent Pinchart (7): > > > > media: uvcvideo: Rename uvc_streaming 'format' field to 'formats' > > > > media: uvcvideo: Rename uvc_format 'frame' field to 'frames' > > > > media: uvcvideo: Use clamp() to replace manual implementation > > > > media: uvcvideo: Reorganize format descriptor parsing > > > > media: uvcvideo: Increment intervals pointer at end of parsing > > > > media: uvcvideo: Constify formats, frames and intervals > > > > media: uvcvideo: Constify descriptor buffers > > > > > > > > Sakari Ailus (1): > > > > Revert "media: uvcvideo: Limit power line control for Acer EasyCamera" > > > > > > > > .../userspace-api/media/v4l/pixfmt-meta-d4xx.rst | 55 +++++++-- > > > > > > This path above is incorrect. > > > > git shortens long lines by removing the left-most parts of the path and > > replacing it with '...'. The file is in > > Documentation/userspace-api/media/v4l/pixfmt-meta-d4xx.rst, it's only > > the shortlog that shows the shortened path. > > > > > > drivers/media/usb/uvc/uvc_driver.c | 137 ++++++++++++++++----- > > > > drivers/media/usb/uvc/uvc_v4l2.c | 79 ++++++------ > > > > drivers/media/usb/uvc/uvc_video.c | 20 +-- > > > > drivers/media/usb/uvc/uvcvideo.h | 12 +- > > > > 5 files changed, 208 insertions(+), 95 deletions(-)
Em Wed, 7 Jun 2023 20:56:29 +0300 Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu: > On Wed, Jun 07, 2023 at 08:47:38PM +0300, Dmitry Perchanov wrote: > > Hi Laurent, > > I saw that Jenkins failed to apply this patch.. > > > > > FAILED: patch patch patches/0002-media-uapi-v4l-Intel-metadata-format-update.patch doesn't apply: > > > Applying patch patches/0002-media-uapi-v4l-Intel-metadata-format-update.patch > > > can't find file to patch at input line 21 > > > > ¯\_(O_o)_/¯ > > I suspect Jenkins may be trying to apply the patch to the wrong branch. Jenkins always try to apply patches on the top of media-stage master. One of the issues with PR e-mails is that they don't specify on what tree/branch a patch should be applied. Ok, it would be doable to have some heuristics logic to try a couple of different options and/or use "since commit" to identify if the tree is the correct one, but the current logic lacks that. The error message seems to indicate that the patch didn't apply cleanly there. It should have been preserved the build information, though. Regards, Mauro
From: builder@linuxtv.org
Pull request: https://patchwork.linuxtv.org/project/linux-media/patch/20230605183025.GA22339@pendragon.ideasonboard.com/
Build log: https://builder.linuxtv.org/job/patchwork/313144/
Build time: 00:00:00
Link: https://lore.kernel.org/linux-media/20230605183025.GA22339@pendragon.ideasonboard.com
gpg: Signature made Mon 05 Jun 2023 03:47:56 PM UTC
gpg: using EDDSA key C09EF871B3827B413F971CA9CC3F2D800327DE64
gpg: issuer "laurent.pinchart@ideasonboard.com"
gpg: Can't check signature: No public key
Build aborted due to a fatal error:
FAILED: patch patch patches/0002-media-uapi-v4l-Intel-metadata-format-update.patch doesn't apply:
Applying patch patches/0002-media-uapi-v4l-Intel-metadata-format-update.patch
can't find file to patch at input line 21
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From 21ebf0d82515edf8bdbd489e6bfe9fe413e56ae3 Mon Sep 17 00:00:00 2001
|From: Dmitry Perchanov <dmitry.perchanov@intel.com>
|Date: Thu, 1 Jun 2023 19:08:46 +0300
|Subject: media: uapi: v4l: Intel metadata format update
|
|Update metadata structure for Intel RealSense UVC/MIPI cameras.
|Compliant to Intel Configuration version 3.
|
|Signed-off-by: Dmitry Perchanov <dmitry.perchanov@intel.com>
|Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com>
|Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|---
| .../media/v4l/pixfmt-meta-d4xx.rst | 55 ++++++++++++++++---
| 1 file changed, 47 insertions(+), 8 deletions(-)
|
|diff --git a/Documentation/userspace-api/media/v4l/pixfmt-meta-d4xx.rst b/Documentation/userspace-api/media/v4l/pixfmt-meta-d4xx.rst
|index 4e437ba97a0e..541836074f94 100644
|--- a/Documentation/userspace-api/media/v4l/pixfmt-meta-d4xx.rst
|+++ b/Documentation/userspace-api/media/v4l/pixfmt-meta-d4xx.rst
--------------------------
No file to patch. Skipping patch.
9 out of 9 hunks ignored
Patch patches/0002-media-uapi-v4l-Intel-metadata-format-update.patch does not apply (enforce with -f)
Hi Mauro, The following changes since commit 9561de3a55bed6bdd44a12820ba81ec416e705a7: Linux 6.4-rc5 (2023-06-04 14:04:27 -0400) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/pinchartl/linux.git tags/media-uvc-next-20230606 for you to fetch changes up to 9bfc8e4d0972d3732bd8c6038c2bf1636780d727: media: uvcvideo: Constify descriptor buffers (2023-06-05 18:39:47 +0300) Please note that this pull request is based on v6.4-rc5 as it depends on a fix that was merged in that version. ---------------------------------------------------------------- Miscellaneous uvcvideo changes: - Support for more Intel RealSense devices - Small cleanups and constifications - Drop duplicate device ---------------------------------------------------------------- Dmitry Perchanov (2): media: uapi: v4l: Intel metadata format update media: uvcvideo: Enable Intel RealSense metadata for devices Laurent Pinchart (7): media: uvcvideo: Rename uvc_streaming 'format' field to 'formats' media: uvcvideo: Rename uvc_format 'frame' field to 'frames' media: uvcvideo: Use clamp() to replace manual implementation media: uvcvideo: Reorganize format descriptor parsing media: uvcvideo: Increment intervals pointer at end of parsing media: uvcvideo: Constify formats, frames and intervals media: uvcvideo: Constify descriptor buffers Sakari Ailus (1): Revert "media: uvcvideo: Limit power line control for Acer EasyCamera" .../userspace-api/media/v4l/pixfmt-meta-d4xx.rst | 55 +++++++-- drivers/media/usb/uvc/uvc_driver.c | 137 ++++++++++++++++----- drivers/media/usb/uvc/uvc_v4l2.c | 79 ++++++------ drivers/media/usb/uvc/uvc_video.c | 20 +-- drivers/media/usb/uvc/uvcvideo.h | 12 +- 5 files changed, 208 insertions(+), 95 deletions(-)