On Thu, Sep 30, 2021 at 3:31 PM Kinsella, Ray <m...@ashroe.eu> wrote: > > > > On 30/09/2021 10:08, sk...@marvell.com wrote: > > From: Sunil Kumar Kori <sk...@marvell.com> > > > > To support ingress policer on CN10K, MBOX interfaces and HW > > definitions are synced. > > > > Signed-off-by: Sunil Kumar Kori <sk...@marvell.com>
# Please add cover letter # Please update the release notes for this feature # Please rebase to next-net-mrvl and fix following issues [for-next-net]dell[dpdk-next-net-mrvl] $ git pw series apply 19286 && rm -rf /tmp/k/* && git format-patch HEAD~27 -o /tmp/k/ && git reset --hard HEAD~27 Applying: common/cnxk: update policer MBOX APIs and HW definitions Applying: common/cnxk: support RoC API to get level to index Using index info to reconstruct a base tree... M drivers/common/cnxk/meson.build M drivers/common/cnxk/roc_nix.h M drivers/common/cnxk/roc_nix_priv.h M drivers/common/cnxk/roc_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_utils.c Auto-merging drivers/common/cnxk/roc_nix_priv.h Auto-merging drivers/common/cnxk/roc_nix.h CONFLICT (content): Merge conflict in drivers/common/cnxk/roc_nix.h Auto-merging drivers/common/cnxk/meson.build error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0002 common/cnxk: support RoC API to get level to index 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". > > --- > > v3: > > - Rebase support on latest DPDK > > - Handled multilevel chaining for tree hierarchy > > - Fix naming convention > > v2: > > - Rebase support on latest DPDK > > - Handled multilevel chaining for linear hierarchy > > - Review comments incorporated > > > > drivers/common/cnxk/hw/nix.h | 13 ++++++++++--- > > drivers/common/cnxk/roc_mbox.h | 34 +++++++++++++++++++++++++++++++++- > > 2 files changed, 43 insertions(+), 4 deletions(-) > > > Acked-by: Ray Kinsella <m...@ashroe.eu> > (for the series).
