|WARNING| pw117864 [PATCH] [v3] config/arm: add PHYTIUM tys2500

[dpdklab at iol.unh.edu]

Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/117864

_apply patch failure_

Submitter: luzhipeng <luzhipeng at cestc.cn>
Date: Tuesday, October 11 2022 01:40:45 
Applied on: CommitID:f13604fad12a81383da7b04821a4befb3d01e2ed
Apply patch set 117864 failed:

Checking patch config/arm/arm64_tys2500_linux_gcc...
Checking patch config/arm/meson.build...
Hunk #1 succeeded at 213 (offset 10 lines).
Hunk #2 succeeded at 350 (offset 11 lines).
error: while searching for:
dpaa:            NXP DPAA
emag:            Ampere eMAG
ft2000plus:      Phytium FT-2000+
graviton2:       AWS Graviton2
kunpeng920:      HiSilicon Kunpeng 920
kunpeng930:      HiSilicon Kunpeng 930

error: patch failed: config/arm/meson.build:414
error: while searching for:
    'dpaa': soc_dpaa,
    'emag': soc_emag,
    'ft2000plus': soc_ft2000plus,
    'graviton2': soc_graviton2,
    'kunpeng920': soc_kunpeng920,
    'kunpeng930': soc_kunpeng930,

error: patch failed: config/arm/meson.build:438
Applied patch config/arm/arm64_tys2500_linux_gcc cleanly.
Applying patch config/arm/meson.build with 2 rejects...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Rejected hunk #3.
Rejected hunk #4.
diff a/config/arm/meson.build b/config/arm/meson.build	(rejected hunks)
@@ -414,6 +432,7 @@ cn10k:           Marvell OCTEON 10
 dpaa:            NXP DPAA
 emag:            Ampere eMAG
 ft2000plus:      Phytium FT-2000+
+tys2500:         Phytium TengYun S2500
 graviton2:       AWS Graviton2
 kunpeng920:      HiSilicon Kunpeng 920
 kunpeng930:      HiSilicon Kunpeng 930
@@ -438,6 +457,7 @@ socs = {
     'dpaa': soc_dpaa,
     'emag': soc_emag,
     'ft2000plus': soc_ft2000plus,
+    'tys2500': soc_tys2500,
     'graviton2': soc_graviton2,
     'kunpeng920': soc_kunpeng920,
     'kunpeng930': soc_kunpeng930,

https://lab.dpdk.org/results/dashboard/patchsets/23905/

UNH-IOL DPDK Community Lab