Hi Patrick,

Thanks for giving the link of commit `a6c3ec342ee1`.

However I cannot checkout this commit in the next-net repository because the commit ID is not exist in the history of next-net repository. Could you find it?

It seems that the commit `a6c3ec342ee1` is nearly identical to the commit `62edcfd6ea3c` except the minor change in the subjects as following:

https://git.dpdk.org/next/dpdk-next-net/commit/?id=62edcfd6ea3c61639df68e4a315046d09f462e8c

I'm able to checkout the commit `62edcfd6ea3c` in the next-net repository but fail to apply this series, because this series conflicts with the commit `a40ac9bcd85c`.

Despite all this, I can apply this series successfully on the artifact of commit `a6c3ec342ee1`:

https://git.dpdk.org/next/dpdk-next-net/snapshot/dpdk-next-net-a6c3ec342ee105e322ffdb21e810cdfd38455c62.zip

Loongson lab always tries to update the local repository with the upstream before testing the series, and just applies the downloaded series to the local repository. So it's possible to skip some commits in Loongson lab when chooses the base for applying.


Best regards,

Min Zhou

On Mon, Jul, 15, 2024 at 3:39PM, Patrick Robb wrote:
Hi Min Zhou,

I am seeing that commit for next-net:
https://git.dpdk.org/next/dpdk-next-net/commit/?id=a6c3ec342ee105e322ffdb21e810cdfd38455c62

If you try to manually apply it on next-net, does it work?

Pasting the logs from our apply process below for context:

```

  Trying to checkout branch: origin/next-net-for-main
  Checked out to next-net-for-main (a6c3ec342ee105e322ffdb21e810cdfd38455c62)
  Applying patch...

  Applying: net/ntnic: add ethdev and makes PMD available
  Applying: net/ntnic: add logging implementation
  Applying: net/ntnic: add minimal initialization for PCI device
  Applying: net/ntnic: add NT utilities implementation
  Applying: net/ntnic: add VFIO module
  Applying: net/ntnic: add basic eth dev ops to ntnic
  Applying: net/ntnic: add core platform structures
  Applying: net/ntnic: add adapter initialization
  Applying: net/ntnic: add registers and FPGA model for NapaTech NIC
  Applying: net/ntnic: add FPGA modules for initialization
  Applying: net/ntnic: add FPGA initialization functionality
  Applying: net/ntnic: add support of the NT200A0X smartNIC
  Applying: net/ntnic: add startup and reset sequence for NT200A0X
  Applying: net/ntnic: add clock profile for the NT200A0X smartNIC
  Applying: net/ntnic: add link management skeleton
  Applying: net/ntnic: add link 100G module ops
  Applying: net/ntnic: add generic NIM and I2C modules
  Applying: net/ntnic: add QSFP support
  Applying: net/ntnic: add QSFP28 support
  Applying: net/ntnic: add GPIO communication for NIMs
  Applying: net/ntnic: add physical layer control module


  Running test build...
  The Meson build system

```

Reply via email to