both are merged. Note: I'm half way through a 6.1 -stable bump, but there are issues on some BSP branches, so expect a bit of volatility in the kernel version until I get that resolved.
Bruce In message: [linux-yocto][linux-yocto v6.1] kernel code for marvell octeon on 14/09/2023 Ruiqiang Hao wrote: > Hi Bruce, > > Please help to merge code into our linux-yocto repo. > > repo: > linux-yocto > branch: > v6.1/standard/cn-sdkv5.15/octeon > > Thanks, > Ruiqiang > > The following changes since commit 3d93ac1a6e2dfe1550842d9c597969ba7b855f3d: > > Merge branch 'v6.1/standard/base' into v6.1/standard/cn-sdkv5.15/octeon > (2023-09-08 09:17:37 -0400) > > are available in the Git repository at: > > [email protected]:cythe/linux.git linux-yocto/v6.1/standard/cn-sdkv5.15/octeon > > for you to fetch changes up to de65af86e11d81f91b26df0714133da69f509444: > > octeontx2-af: Add debug logs. (2023-09-14 02:07:22 +0000) > > ---------------------------------------------------------------- > Geetha sowjanya (3): > octeontx2-af: fix truncation of smq in CN10K NIX AQ enqueue mbox handler > octeontx2-pf: Fix dangling pointers in the netdev qset > octeontx2-pf: Add more debug messages > > George Cherian (1): > drivers: watchdog: marvell_gti: Program the max_hw_heartbeat_ms > > Gowthami (1): > perf/marvell: Apply TAD pmu errata to cn10k silicons > > Hariprasad Kelam (1): > octeontx2-af: CN10KB: fix PFC configuration > > Jayanthi Annadurai (1): > edac: octeontx: Add error syndrome > > Michael Lawnick (1): > drivers: octeontx2: memtest: Retry on failing SPI lock > > Piyush Malgujar (1): > soc: marvell: otx2: Add CN10 check > > Ratheesh Kannoth (2): > octeontx2-pf: Set maximum queue size to 16K > octeontx2-af: Add debug logs. > > Srujana Challa (1): > crypto: octeontx2: add timeout for load_fvc completion poll > > Subbaraya Sundeep (3): > octeontx2-pf: mcs: Generate hash key using ecb(aes) > octeontx2: Improve mailbox tracepoints for debugging > octeontx2-af: Consider the action set by PF > > Suneel Garapati (2): > drivers: i2c-octeon-core: Add recovery for WDOG_TOUT error status > drivers: cadence-xspi: Optimize workaround logic > > .../crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 14 +- > drivers/edac/octeontx_edac.c | 2 +- > drivers/edac/octeontx_edac.h | 1 + > drivers/firmware/octeontx2/memtest.c | 64 ++++++++-- > drivers/i2c/busses/i2c-octeon-core.c | 2 +- > drivers/net/ethernet/marvell/octeontx2/af/mbox.c | 6 +- > drivers/net/ethernet/marvell/octeontx2/af/rpm.c | 17 +-- > drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 2 +- > .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 2 +- > .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 30 ++++- > .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 4 + > .../net/ethernet/marvell/octeontx2/af/rvu_trace.c | 1 + > .../net/ethernet/marvell/octeontx2/af/rvu_trace.h | 51 ++++++-- > .../ethernet/marvell/octeontx2/nic/cn10k_macsec.c | 137 ++++++++++++++------ > .../ethernet/marvell/octeontx2/nic/otx2_common.h | 4 +- > .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 2 +- > .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 67 ++++++++-- > .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 2 +- > drivers/perf/marvell_cn10k_tad_pmu.c | 13 +- > .../soc/marvell/octeontx2-ghes/otx2-ghes-init.c | 5 + > drivers/spi/Kconfig | 61 +++------ > drivers/spi/spi-cadence-xspi.c | 141 > +++++---------------- > drivers/watchdog/marvell_gti_wdt.c | 1 + > 23 files changed, 378 insertions(+), 251 deletions(-) In message: [linux-yocto][linux-yocto v6.1] kernel code for marvell octeon [RT] on 14/09/2023 Ruiqiang Hao wrote: > Hi Bruce, > > Please help to merge code into our linux-yocto repo. > > repo: > linux-yocto > branch: > v6.1/standard/preempt-rt/cn-sdkv5.15/octeon > > Thanks, > Ruiqiang > > The following changes since commit db3c7e43c6af49aa6711d7a0f44db5a1eeda8b52: > > Merge branch 'v6.1/standard/base' into > v6.1/standard/preempt-rt/cn-sdkv5.15/octeon (2023-09-08 09:17:50 -0400) > > are available in the Git repository at: > > [email protected]:cythe/linux.git > linux-yocto/v6.1/standard/preempt-rt/cn-sdkv5.15/octeon > > for you to fetch changes up to 9a7f451ba70f2158c408e3ed6f87f737836c6ed1: > > octeontx2-af: Add debug logs. (2023-09-14 07:50:22 +0000) > > ---------------------------------------------------------------- > Geetha sowjanya (3): > octeontx2-af: fix truncation of smq in CN10K NIX AQ enqueue mbox handler > octeontx2-pf: Fix dangling pointers in the netdev qset > octeontx2-pf: Add more debug messages > > George Cherian (1): > drivers: watchdog: marvell_gti: Program the max_hw_heartbeat_ms > > Gowthami (1): > perf/marvell: Apply TAD pmu errata to cn10k silicons > > Hariprasad Kelam (1): > octeontx2-af: CN10KB: fix PFC configuration > > Jayanthi Annadurai (1): > edac: octeontx: Add error syndrome > > Michael Lawnick (1): > drivers: octeontx2: memtest: Retry on failing SPI lock > > Piyush Malgujar (1): > soc: marvell: otx2: Add CN10 check > > Ratheesh Kannoth (2): > octeontx2-pf: Set maximum queue size to 16K > octeontx2-af: Add debug logs. > > Srujana Challa (1): > crypto: octeontx2: add timeout for load_fvc completion poll > > Subbaraya Sundeep (3): > octeontx2-pf: mcs: Generate hash key using ecb(aes) > octeontx2: Improve mailbox tracepoints for debugging > octeontx2-af: Consider the action set by PF > > Suneel Garapati (2): > drivers: i2c-octeon-core: Add recovery for WDOG_TOUT error status > drivers: cadence-xspi: Optimize workaround logic > > .../crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 14 +- > drivers/edac/octeontx_edac.c | 2 +- > drivers/edac/octeontx_edac.h | 1 + > drivers/firmware/octeontx2/memtest.c | 64 ++++++++-- > drivers/i2c/busses/i2c-octeon-core.c | 2 +- > drivers/net/ethernet/marvell/octeontx2/af/mbox.c | 6 +- > drivers/net/ethernet/marvell/octeontx2/af/rpm.c | 17 +-- > drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 2 +- > .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 2 +- > .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 30 ++++- > .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 4 + > .../net/ethernet/marvell/octeontx2/af/rvu_trace.c | 1 + > .../net/ethernet/marvell/octeontx2/af/rvu_trace.h | 51 ++++++-- > .../ethernet/marvell/octeontx2/nic/cn10k_macsec.c | 137 ++++++++++++++------ > .../ethernet/marvell/octeontx2/nic/otx2_common.h | 4 +- > .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 2 +- > .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 67 ++++++++-- > .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 2 +- > drivers/perf/marvell_cn10k_tad_pmu.c | 13 +- > .../soc/marvell/octeontx2-ghes/otx2-ghes-init.c | 5 + > drivers/spi/Kconfig | 61 +++------ > drivers/spi/spi-cadence-xspi.c | 141 > +++++---------------- > drivers/watchdog/marvell_gti_wdt.c | 1 + > 23 files changed, 378 insertions(+), 251 deletions(-)
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13067): https://lists.yoctoproject.org/g/linux-yocto/message/13067 Mute This Topic: https://lists.yoctoproject.org/mt/101366015/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/leave/6687884/21656/624485779/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
