From: Jerin Jacob <jerinjacobk@gmail.com>
To: Rakesh Kudurumalla <rkudurumalla@marvell.com>
Cc: Nithin Dabilpuram <ndabilpuram@marvell.com>,
Kiran Kumar K <kirankumark@marvell.com>,
Sunil Kumar Kori <skori@marvell.com>,
Satha Rao <skoteshwar@marvell.com>,
dev@dpdk.org, jerinj@marvell.com
Subject: Re: [PATCH v3 1/1] common/cnxk: add mbox locking
Date: Fri, 13 Jan 2023 11:03:12 +0530 [thread overview]
Message-ID: <CALBAE1P8m8V=Zh2XPMCR90KEpjyBSuZGxxTnBeu3ywLGwpKMBw@mail.gmail.com> (raw)
In-Reply-To: <20230106174453.2152659-1-rkudurumalla@marvell.com>
On Fri, Jan 6, 2023 at 11:15 PM Rakesh Kudurumalla
<rkudurumalla@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 <rkudurumalla@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
>
next prev parent reply other threads:[~2023-01-13 5:33 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-23 11:26 [PATCH " Rakesh Kudurumalla
2023-01-04 6:57 ` [PATCH v2 " Rakesh Kudurumalla
2023-01-04 7:05 ` Nithin Kumar Dabilpuram
2023-01-06 17:44 ` [PATCH v3 " Rakesh Kudurumalla
2023-01-13 5:33 ` Jerin Jacob [this message]
2023-01-13 9:58 ` [PATCH v4 " Rakesh Kudurumalla
2023-01-16 7:12 ` Jerin Jacob
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CALBAE1P8m8V=Zh2XPMCR90KEpjyBSuZGxxTnBeu3ywLGwpKMBw@mail.gmail.com' \
--to=jerinjacobk@gmail.com \
--cc=dev@dpdk.org \
--cc=jerinj@marvell.com \
--cc=kirankumark@marvell.com \
--cc=ndabilpuram@marvell.com \
--cc=rkudurumalla@marvell.com \
--cc=skori@marvell.com \
--cc=skoteshwar@marvell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).