On Fri, Jan 6, 2023 at 11:15 PM Rakesh Kudurumalla <rkuduruma...@marvell.com> wrote: > > this patch adds mbox locking using spinlock > to have different subsystems sharing same mbox
Clean up the git commit and tell why? > > Signed-off-by: Rakesh Kudurumalla <rkuduruma...@marvell.com> Please fix the below and resend the next version [for-next-net]dell[dpdk-next-net-mrvl] $ git pw series apply 26419 Failed to apply patch: Applying: common/cnxk: add mbox locking Using index info to reconstruct a base tree... M drivers/common/cnxk/roc_cpt.c M drivers/common/cnxk/roc_nix_debug.c M drivers/common/cnxk/roc_nix_inl_dev.c M drivers/common/cnxk/roc_nix_queue.c M drivers/common/cnxk/roc_nix_tm.c M drivers/common/cnxk/roc_nix_tm_ops.c M drivers/common/cnxk/roc_npc.c M drivers/common/cnxk/roc_npc_mcam.c M drivers/common/cnxk/roc_npc_utils.c M drivers/common/cnxk/version.map Falling back to patching base and 3-way merge... Auto-merging drivers/common/cnxk/version.map Auto-merging drivers/common/cnxk/roc_npc_utils.c Auto-merging drivers/common/cnxk/roc_npc_mcam.c CONFLICT (content): Merge conflict in drivers/common/cnxk/roc_npc_mcam.c Auto-merging drivers/common/cnxk/roc_npc.c Auto-merging drivers/common/cnxk/roc_nix_tm_ops.c Auto-merging drivers/common/cnxk/roc_nix_tm.c Auto-merging drivers/common/cnxk/roc_nix_queue.c Auto-merging drivers/common/cnxk/roc_nix_inl_dev.c Auto-merging drivers/common/cnxk/roc_nix_debug.c Auto-merging drivers/common/cnxk/roc_cpt.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 common/cnxk: add mbox locking 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". > -- > 2.25.1 >
