For whatever reason the merge email seem to have arrived with multiple copies.
So i just used the last to arrive for each. I had previously merged the standard/ version of the BSP, so that was up to date, and this preempt-rt version merged without issues. So both are now pushed to the main repo. Bruce In message: Check-in Request for CN96xx BSP on LTS21 on v5.10/standard/preempt-rt/cn-sdkv4.18/cn96xx branch on 15/07/2021 Abhishek, Paliwal wrote: > Hi Bruce, > > Could you please merge the below patches in linux-yocto repository: > > From branch > > v5.10/standard/preempt-rt/cn-sdkv4.18/cn96xx in https://github.com/ > abhishpaliwal/linux-yocto.git > > To branch > > v5.10/standard/preempt-rt/cn-sdkv4.18/cn96xx in https://git.yoctoproject.org/ > git/linux-yocto.git > > The following changes since commit 389894503b361e197aab5378f2fbe1db9d262d3d: > > Merge branch 'v5.10/standard/base' into > v5.10/standard/preempt-rt/cn-sdkv4.18 > /cn96xx (2021-07-03 23:29:11 -0400) > > are available in the Git repository at: > > https://github.com/abhishpaliwal/linux-yocto.git > 9558ca0f9fc1ddc43e810620cf6a948c0e11cecc > > for you to fetch changes up to 9558ca0f9fc1ddc43e810620cf6a948c0e11cecc: > > octeontx2-af: Read mac address from correct offset (2021-07-15 17:00:04 > +0800) > > ---------------------------------------------------------------- > Baha Mesleh (1): > octeontx2-bphy-netdev: fix cleanup sequence in char device release > > Geetha sowjanya (2): > octeontx2-af: Fix PKIND overlap between LBK and LMAC interfaces > octeontx2-af: Fix max pkinds supported by hardware > > George Cherian (4): > octeontx2-af: Enhance the parser support for Forward DSA > octeontx2-af: Remove ITAG support from KPU profile > octeontx2-af: Add KPU support to parse PPPoE packets > octeontx2-af: Fix the KPU support to parse PPPoE packets > > Hariprasad Kelam (10): > octeontx-af: Add debug info on Mac address change > octeontx2-af: Refactor vf flags > octeontx2-af: new mbox to configure vf permissions > octeontx2-pf: Read correct number of VFs > octeontx2-pf: Add trusted vf support > octeontx2-af: Debugfs support for DMAC filters > octeontx2-af: mbox messages to configure DMAC filter > octeontx2-pf: offload DMAC filters to CGX/RPM block > octeontx2-pf: Dont enable backpressure on lbk links > octeontx2-af: Read mac address from correct offset > > Naveen Mamindlapalli (11): > octeontx2-bphy-netdev: Fix common lmac resource free > octeontx2-bphy-netdev: avoid multiple kfree of common lmac objects > octeontx2-bphy-netdev: Add rfoe rx vlan forwarding configuration > octeontx2-bphy-netdev: cpri: fix compilation warnings > octeontx2-af: Add multicast/promisc packet replication table > octeontx2-nicvf: Add ndo_set_rx_mode handler to support > multicast/promisc > octeontx2-af: add vf trust check to set_rx_mode mbox handler > octeontx2-af: Added to flag to disable promisc and multicast MCE entry > octeontx2-af: fix error return code in rvu_mbox_handler_set_vf_perm > octeontx2-af: Fix LBK ping RX issue on NIX1 > octeontx2-bphy-netdev: don't process a packet when psw indicates error > > Nithin Dabilpuram (1): > octeontx2-af: consider pcifunc zero map entries as disabled > > Radha Mohan Chintakuntla (3): > octeontx2-af: Increase the NIX LF resources for 98xx > octeontx2-sdp: Fix FLR and MBOX interrupt enable and disable > octeontx2-af: Fix ending channel number calculation for SDP VF > > Satha Rao (2): > octeontx2-af: Fix channel verification and sdp vf mcam > octeontx2-af: fix header lengths while parsing edsa vlan > > Subbaraya Sundeep (2): > octeontx2-af: Modify install flow error codes > octeontx2-af: Fix TX scheduler queue config read check > > Sunil Kumar Kori (1): > octeontx2-af: add multicast filter support > > drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 92 > +++++++++- > drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 6 +- > drivers/net/ethernet/marvell/octeontx2/af/common.h | 1 + > drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 27 +++ > drivers/net/ethernet/marvell/octeontx2/af/npc.h | 8 +- > drivers/net/ethernet/marvell/octeontx2/af/npc_profile.h | 1006 > +++++++++++++++++++++++++++---------------------------------------------------------------------------- > drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 42 +++++ > drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 52 +++++- > drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 29 ++- > drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c | 105 > +++++++++-- > drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c | 275 > ++++++++++++++++++++++------ > drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c | 267 > +++++++++++++++++++--------- > drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 18 +- > drivers/net/ethernet/marvell/octeontx2/af/rvu_validation.c | 5 +- > drivers/net/ethernet/marvell/octeontx2/bphy/otx2_bphy_hw.h | 10 ++ > drivers/net/ethernet/marvell/octeontx2/bphy/otx2_bphy_main.c | 25 ++- > drivers/net/ethernet/marvell/octeontx2/bphy/otx2_cpri.c | 17 +- > drivers/net/ethernet/marvell/octeontx2/bphy/otx2_cpri.h | 1 + > drivers/net/ethernet/marvell/octeontx2/bphy/otx2_rfoe.c | 116 > +++++++++++- > drivers/net/ethernet/marvell/octeontx2/bphy/otx2_rfoe.h | 4 + > drivers/net/ethernet/marvell/octeontx2/nic/Makefile | 2 +- > drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c | 25 +-- > drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h | 17 ++ > drivers/net/ethernet/marvell/octeontx2/nic/otx2_dmac_flt.c | 173 > ++++++++++++++++++ > drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c | 223 > ++++++++++++++++++++++- > drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 73 +++++++- > drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 59 +++++- > drivers/soc/marvell/octeontx2-sdp/sdp.c | 135 > +++++++------- > 28 files changed, 1783 insertions(+), 1030 deletions(-) > create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/otx2_dmac_flt.c > > Regards, > Abhishek
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#10134): https://lists.yoctoproject.org/g/linux-yocto/message/10134 Mute This Topic: https://lists.yoctoproject.org/mt/84222566/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
