Re: [PATCH v3] common/cnxk: fix IRQ reconfiguration

[Jerin Jacob <jerinjacobk@gmail.com>]

On Sun, Sep 29, 2024 at 9:38 PM <pbhagavatula@marvell.com> wrote:
>
> From: Pavan Nikhilesh <pbhagavatula@marvell.com>
>
> Unregister SSO device and NPA IRQs before resizing
> IRQs to cleanup stale IRQ handles.
>
> Fixes: 993107f0f440 ("common/cnxk: limit SSO interrupt allocation count")
> Cc: stable@dpdk.org
>
> Signed-off-by: Pavan Nikhilesh <pbhagavatula@marvell.com>
> ---
> v2 Changes:
> - Reorder npa interrupt un-registration.
> v3 Changes:
> - Update commit type to fixes.


Could you rebase to next-net-mrvl/for-main

[for-main]dell[dpdk-next-net-mrvl] $ git pw series apply 33173
Failed to apply patch:
Applying: common/cnxk: fix IRQ reconfiguration
Using index info to reconstruct a base tree...
M       drivers/common/cnxk/roc_dev.c
M       drivers/common/cnxk/roc_dev_priv.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/common/cnxk/roc_dev_priv.h
Auto-merging drivers/common/cnxk/roc_dev.c
CONFLICT (content): Merge conflict in drivers/common/cnxk/roc_dev.c
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 0001 common/cnxk: fix IRQ reconfiguration