[PATCH v2 0/4] Raspberry Pi: Various changes

[Kieran Bingham]

Hi Naush,

Quoting Naushir Patuck (2025-01-08 09:01:39)
> Gentle ping - I think these patches are ready to be merged now.
> 

I'm happy to merge them, but they don't currently apply.
I think I was waiting on you to rebase and repost, but I think I just
mentioned it in a call, and didn't reply to this series directly.

kbingham at Monstersaurus:~/iob/libcamera/ci/libcamera-gitlab-ci$ ./send-for-testing.sh 4910
git -C libcamera fetch --prune libcamera.org
>From https://git.libcamera.org/libcamera/libcamera
   545046a41e17..2d4660b51aee  master     -> libcamera.org/master
Preparing patchwork/4910
git -C libcamera show-ref --verify --quiet refs/heads/patchwork/4910
git -C libcamera branch -D patchwork/4910
Deleted branch patchwork/4910 (was c71dcb9e8ee5).
git -C libcamera checkout -b patchwork/4910
Switched to a new branch 'patchwork/4910'
git -C libcamera pw series apply 4910 -s
Applying: ipa: rpi: Use r-value references in the set()/setLocked() functions
Applying: ipa: rpi: Add erase()/eraseLocked() to RPiController::Metadata
Applying: ipa: rpi: Add a HW property to determine if the data buffer is strided
Applying: ipa: rpi: Provide the camera helper with the hardware configuration
Using index info to reconstruct a base tree...
M	src/ipa/rpi/cam_helper/cam_helper.cpp
M	src/ipa/rpi/cam_helper/cam_helper.h
M	src/ipa/rpi/common/ipa_base.cpp
Falling back to patching base and 3-way merge...
Auto-merging src/ipa/rpi/common/ipa_base.cpp
Auto-merging src/ipa/rpi/cam_helper/cam_helper.h
Auto-merging src/ipa/rpi/cam_helper/cam_helper.cpp
CONFLICT (content): Merge conflict in src/ipa/rpi/cam_helper/cam_helper.cpp
Recorded preimage for 'src/ipa/rpi/cam_helper/cam_helper.cpp'
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0004 ipa: rpi: Provide the camera helper with the hardware configuration

--
Kieran

> On Wed, 18 Dec 2024 at 08:36, Naushir Patuck <naush at raspberrypi.com> wrote:
> >
> > Hi,
> >
> > This revision fixes up all the minor typos reported by David and Laurent. I've
> > also removed the CNN control related patches.  Patch 4/4 needs one more R-B tag
> > and this should be ready to merge.
> >
> > Regards,
> > Naush
> >
> > Naushir Patuck (4):
> >   ipa: rpi: Use r-value references in the set()/setLocked() functions
> >   ipa: rpi: Add erase()/eraseLocked() to RPiController::Metadata
> >   ipa: rpi: Add a HW property to determine if the data buffer is strided
> >   ipa: rpi: Provide the camera helper with the hardware configuration
> >
> >  src/ipa/rpi/cam_helper/cam_helper.cpp |  5 +++++
> >  src/ipa/rpi/cam_helper/cam_helper.h   |  2 ++
> >  src/ipa/rpi/common/ipa_base.cpp       |  1 +
> >  src/ipa/rpi/controller/controller.cpp |  2 ++
> >  src/ipa/rpi/controller/controller.h   |  1 +
> >  src/ipa/rpi/controller/metadata.h     | 23 +++++++++++++++++++----
> >  6 files changed, 30 insertions(+), 4 deletions(-)
> >
> > --
> > 2.43.0
> >