libcamera: controls: Revert incorrect SPDX removal
diff mbox series

Message ID 20250619111614.1132382-1-kieran.bingham@ideasonboard.com
State New
Headers show
Series
  • libcamera: controls: Revert incorrect SPDX removal
Related show

Commit Message

Kieran Bingham June 19, 2025, 11:16 a.m. UTC
In commit 6a09deaf7d4a ("controls: Add FrameWallClock control") the
existing SPDX was accidentally removed, likely from a rebase operation
at some point.

Unfortunately as this patch had already collected Reviewed-by tags, the
surruptious removal wasn't noticed until after it was merged.

Re-insert the existing SPDX and copyright banner as the header to the
control definitions file.

Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---

Ooops, I merged something that interferred with the existing copyright
header. This brings it back again.

 src/libcamera/control_ids_core.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Naushir Patuck June 19, 2025, 11:50 a.m. UTC | #1
Sorry I missed that accidental removal :(

On Thu, 19 Jun 2025 at 12:16, Kieran Bingham
<kieran.bingham@ideasonboard.com> wrote:
>
> In commit 6a09deaf7d4a ("controls: Add FrameWallClock control") the
> existing SPDX was accidentally removed, likely from a rebase operation
> at some point.
>
> Unfortunately as this patch had already collected Reviewed-by tags, the
> surruptious removal wasn't noticed until after it was merged.
>
> Re-insert the existing SPDX and copyright banner as the header to the
> control definitions file.
>
> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

Reviewed-by: Naushir Patuck <naush@raspberrypi.com>

> ---
>
> Ooops, I merged something that interferred with the existing copyright
> header. This brings it back again.
>
>  src/libcamera/control_ids_core.yaml | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/src/libcamera/control_ids_core.yaml b/src/libcamera/control_ids_core.yaml
> index 028919ef3d3e..46f51436c215 100644
> --- a/src/libcamera/control_ids_core.yaml
> +++ b/src/libcamera/control_ids_core.yaml
> @@ -1,4 +1,6 @@
> -
> +# SPDX-License-Identifier: LGPL-2.1-or-later
> +#
> +# Copyright (C) 2019, Google Inc.
>  #
>  %YAML 1.1
>  ---
> --
> 2.49.0
>
Laurent Pinchart June 19, 2025, 12:08 p.m. UTC | #2
On Thu, Jun 19, 2025 at 12:16:14PM +0100, Kieran Bingham wrote:
> In commit 6a09deaf7d4a ("controls: Add FrameWallClock control") the
> existing SPDX was accidentally removed, likely from a rebase operation
> at some point.
> 
> Unfortunately as this patch had already collected Reviewed-by tags, the
> surruptious removal wasn't noticed until after it was merged.
> 
> Re-insert the existing SPDX and copyright banner as the header to the
> control definitions file.
> 
> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
> 
> Ooops, I merged something that interferred with the existing copyright
> header. This brings it back again.
> 
>  src/libcamera/control_ids_core.yaml | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/src/libcamera/control_ids_core.yaml b/src/libcamera/control_ids_core.yaml
> index 028919ef3d3e..46f51436c215 100644
> --- a/src/libcamera/control_ids_core.yaml
> +++ b/src/libcamera/control_ids_core.yaml
> @@ -1,4 +1,6 @@
> -
> +# SPDX-License-Identifier: LGPL-2.1-or-later
> +#
> +# Copyright (C) 2019, Google Inc.
>  #
>  %YAML 1.1
>  ---

Patch
diff mbox series

diff --git a/src/libcamera/control_ids_core.yaml b/src/libcamera/control_ids_core.yaml
index 028919ef3d3e..46f51436c215 100644
--- a/src/libcamera/control_ids_core.yaml
+++ b/src/libcamera/control_ids_core.yaml
@@ -1,4 +1,6 @@ 
-
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# Copyright (C) 2019, Google Inc.
 #
 %YAML 1.1
 ---