Re: [PATCH v2 0/8] media: qcom: camss: Add sm8550 support

From: Bryan O'Donoghue
Date: Wed Mar 20 2024 - 11:09:12 EST


On 20/03/2024 14:11, Depeng Shao wrote:
V2:
- Update some commit messages
Link to V1: https://lore.kernel.org/all/20240320134227.16587-1-quic_depengs@xxxxxxxxxxx/

Here's your first problem, doesn't apply.

Please rebase on - at a minimum linux-next or on top of this branch

https://git.codelinaro.org/bryan.odonoghue/kernel/-/tree/b4/camss-sc8280xp-v6?ref_type=heads

and indicate which branch you've done the work against.

deckard@sagittarius-a:~/Development/qualcomm/qlt-kernel$ git fetch linux-next
remote: Enumerating objects: 1907, done.
remote: Counting objects: 100% (1860/1860), done.
remote: Compressing objects: 100% (491/491), done.
remote: Total 1907 (delta 1432), reused 1759 (delta 1367), pack-reused 47
Receiving objects: 100% (1907/1907), 1.16 MiB | 8.24 MiB/s, done.
Resolving deltas: 100% (1461/1461), completed with 263 local objects.
From git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next
+ 226d3c72fcde1...72fb52fb0ac44 master -> linux-next/master (forced update)
+ 00fe0619c6bef...ad58b0c356a01 pending-fixes -> linux-next/pending-fixes (forced update)
bf3a69c6861ff..78c3925c048c7 stable -> linux-next/stable
* [new tag] next-20240320 -> next-20240320

deckard@sagittarius-a:~/Development/qualcomm/qlt-kernel$ git checkout -b linux-next-24-03-20-sm8550 linux-next/master

Updating files: 100% (18508/18508), done.
branch 'linux-next-24-03-20-sm8550' set up to track 'linux-next/master'.
Switched to a new branch 'linux-next-24-03-20-sm8550'
deckard@sagittarius-a:~/Development/qualcomm/qlt-kernel$ b4 shazam 20240320141136.26827-1-quic_depengs@xxxxxxxxxxx
Grabbing thread from lore.kernel.org/all/20240320141136.26827-1-quic_depengs@xxxxxxxxxxx/t.mbox.gz
Checking for newer revisions
Grabbing search results from lore.kernel.org
Analyzing 10 messages in the thread
Checking attestation on all messages, may take a moment...
---
[PATCH v2 1/8] media: qcom: camss: Add CAMSS_8550 enum
+ Acked-by: Bryan O'Donoghue <bryan.odonoghue@xxxxxxxxxx>
[PATCH v2 2/8] media: qcom: camss: Add subdev notify support
[PATCH v2 3/8] media: qcom: camss: Add new csiphy driver 2-1-2
[PATCH v2 4/8] media: qcom: camss: Add new params for csid_device
[PATCH v2 5/8] media: qcom: camss: Add CSID gen3 driver
[PATCH v2 6/8] media: qcom: camss: Add new VFE driver for SM8550
[PATCH v2 7/8] media: qcom: camss: Add sm8550 resources
[PATCH v2 8/8] media: qcom: camss: Add sm8550 support
---
NOTE: install dkimpy for DKIM signature verification
---
Total patches: 8
---
Applying: media: qcom: camss: Add CAMSS_8550 enum
Patch failed at 0001 media: qcom: camss: Add CAMSS_8550 enum
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
error: patch failed: drivers/media/platform/qcom/camss/camss.h:78
error: drivers/media/platform/qcom/camss/camss.h: patch does not apply
hint: Use 'git am --show-current-patch=diff' to see the failed patch

---
bod