On Wed, Mar 3, 2021 at 10:15 PM Ruiqiang Hao <ruiqiang....@windriver.com> wrote:
>
> Hi Bruce,
>
> Please help to merge code into our linux-yocto repo.
>
> repo:
> linux-yocto
> branch:
> v5.10/standard/cn-sdkv4.18/cn96xx
I was able to merge your branch into the above (and pushed it for your
reference).
> v5.10/standard/preempt-rt/cn-sdkv4.18/cn96xx
But I got multiple conflicts on this branch.
build [/home/bruc...-yocto.git]> git status
On branch v5.10/standard/preempt-rt/cn-sdkv4.18/cn96xx
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Changes to be committed:
modified: drivers/net/ethernet/marvell/octeontx2/af/ptp.c
modified: drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: drivers/net/ethernet/marvell/octeontx2/af/cgx.c
both modified: drivers/net/ethernet/marvell/octeontx2/af/mbox.h
both modified: drivers/net/ethernet/marvell/octeontx2/af/npc.h
both modified: drivers/net/ethernet/marvell/octeontx2/af/npc_profile.h
both modified: drivers/net/ethernet/marvell/octeontx2/af/rvu.c
both modified: drivers/net/ethernet/marvell/octeontx2/af/rvu.h
both modified: drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c
both added: drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c
both modified: drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
both added: drivers/net/ethernet/marvell/octeontx2/af/rvu_fixes.c
both modified: drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
both modified: drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
both added: drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c
both added: drivers/net/ethernet/marvell/octeontx2/af/rvu_ree.c
both added: drivers/net/ethernet/marvell/octeontx2/af/rvu_sdp.c
both added: drivers/net/ethernet/marvell/octeontx2/af/rvu_sso.c
both added: drivers/net/ethernet/marvell/octeontx2/af/rvu_tim.c
both added:
drivers/net/ethernet/marvell/octeontx2/bphy/otx2_bphy_hw.h
both added:
drivers/net/ethernet/marvell/octeontx2/bphy/otx2_bphy_main.c
both added: drivers/net/ethernet/marvell/octeontx2/bphy/otx2_cpri.c
both added: drivers/net/ethernet/marvell/octeontx2/bphy/otx2_rfoe.c
both added: drivers/net/ethernet/marvell/octeontx2/bphy/otx2_rfoe.h
both added:
drivers/net/ethernet/marvell/octeontx2/bphy/otx2_rfoe_ethtool.c
both added: drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c
both added: drivers/soc/marvell/octeontx2-ghes/otx2-sdei-ghes.c
It may be that I missed your previous merge (I don't see
linux-yocto/v5.10/standard/sdkv4.18/cn96xx.v3-merge) in the history,
and I no longer have it in my tree for re-merging. But the 'both
added', implies that I may have the base history wrong on that branch
completely.
Can you check on what I've managed to mix up, and send a fixup branch
for me to merge ?
Bruce
>
> Thanks,
> Ruiqiang
>
> The following changes since commit eb27f9bd98a8f156786862624ab6f921f6916667:
>
> Merge branch 'linux-yocto/v5.10/standard/sdkv4.18/cn96xx.v3-merge' into
> v5.10/standard/cn-sdkv4.18/cn96xx (2021-02-22 20:03:41 -0500)
>
> are available in the Git repository at:
>
> https://github.com/cythe/linux.git
> linux-yocto/v5.10/standard/cn-sdkv4.18/cn96xx
>
> for you to fetch changes up to 371d381b6294bc04624ad76c584a37506db7228e:
>
> octeontx2-af: Fix VF mac configuration by VF. (2021-03-03 08:10:45 +0000)
>
> ----------------------------------------------------------------
> Geetha sowjanya (3):
> octeontx2-af: TIM: Set conditional clock always on
> octeontx2-af: Use pci revision id for platform check.
> octeontx2-af: Add F95XXO RVU PCI revision ID
>
> Kiran Kumar K (3):
> octeontx2-af: add KPU support to parse NGIO protocol
> octeontx2-af: add KPU parse support for VLAN EXDSA
> octeontx2-af: add KPU changes to parse L4 for fragmented CPT packets
>
> Nalla, Pradeep (1):
> octeontx2-af: Multi channel in NIX promisc entry.
>
> Naveen Mamindlapalli (10):
> octeontx2-af: add ratelimit to limit the asynchronous err messages
> octeontx2-pf: Add flow classification using IP protocol
> octeontx2-bphy-netdev: Added RFOE LMAC stats to ethtool
> octeontx2-bphy-netdev: Fix ptp tx processing race condition
> octeontx2-bphy-netdev: Fix napi schedule issue when intf is down
> octeontx2-bphy-netdev: Add timeout to ptp transmit timestamp polling
> octeontx2-bphy-netdev: remove unnecessary check when setting INTF_DOWN
> flag
> octeontx2-af: refactor function npc_install_flow for default entry
> octeontx2-af: Use install flow API for promisc and broadcast entries
> octeontx2-af: Fix incorrect MCAM INTF configuration for NIX1
>
> Rakesh Babu (1):
> octeontx2-af: Formatting debugfs entry rsrc_alloc.
>
> Rick Farrington (1):
> drivers: marvell: otx2-sdei-ghes: support GHES area > top-of-mem
>
> Ruiqiang Hao (1):
> octeontx2-af: apply the patch part delete by mistake
>
> Satheesh Paul (1):
> octeontx2-af: Add packet parser error codes to MCAM match key
>
> Subbaraya Sundeep (5):
> octeontx2-af: Disable packet TX and RX
> octeontx2-af: Support ESP/AH RSS hashing
> octeontx2-af: Do not clear TL1 mapping info
> octeontx2-af: Remove TOS field from MKEX TX
> octeontx2-af: Fix VF mac configuration by VF.
>
> drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 6 +
> drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 3 +
> drivers/net/ethernet/marvell/octeontx2/af/npc.h | 13 +
> .../ethernet/marvell/octeontx2/af/npc_profile.h | 7479
> ++++++++++++--------
> drivers/net/ethernet/marvell/octeontx2/af/ptp.c | 4 +
> drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 5 +-
> drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 58 +-
> .../net/ethernet/marvell/octeontx2/af/rvu_cpt.c | 8 +-
> .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 48 +-
> .../net/ethernet/marvell/octeontx2/af/rvu_fixes.c | 13 +-
> .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 63 +-
> .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 161 +-
> .../net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 107 +-
> .../net/ethernet/marvell/octeontx2/af/rvu_ree.c | 16 +-
> .../net/ethernet/marvell/octeontx2/af/rvu_sdp.c | 16 +-
> .../net/ethernet/marvell/octeontx2/af/rvu_sso.c | 34 +-
> .../net/ethernet/marvell/octeontx2/af/rvu_tim.c | 3 +
> .../ethernet/marvell/octeontx2/bphy/otx2_bphy_hw.h | 15 +
> .../marvell/octeontx2/bphy/otx2_bphy_main.c | 28 +-
> .../ethernet/marvell/octeontx2/bphy/otx2_cpri.c | 3 +-
> .../ethernet/marvell/octeontx2/bphy/otx2_rfoe.c | 85 +-
> .../ethernet/marvell/octeontx2/bphy/otx2_rfoe.h | 8 +
> .../marvell/octeontx2/bphy/otx2_rfoe_ethtool.c | 29 +
> .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 37 +-
> .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 116 +-
> .../soc/marvell/octeontx2-ghes/otx2-sdei-ghes.c | 80 +-
> 26 files changed, 5357 insertions(+), 3081 deletions(-)
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#9509):
https://lists.yoctoproject.org/g/linux-yocto/message/9509
Mute This Topic: https://lists.yoctoproject.org/mt/81069768/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
