|WARNING| pw127134 [PATCH] [v4] net/gve: check driver compatibility

|WARNING| pw127134 [PATCH] [v4] net/gve: check driver compatibility

[dpdklab]

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

_apply patch failure_

Submitter: Rushil Gupta <rushilg@google.com>
Date: Friday, May 19 2023 19:54:38 
Applied on: CommitID:a399d7b5a994e335c446d4b15d7622d71dd8848c
Apply patch set 127134 failed:

Checking patch drivers/net/gve/base/gve.h...
error: while searching for:
#include "gve_desc.h"
#include "gve_desc_dqo.h"

#define GVE_VERSION		"1.3.0"
#define GVE_VERSION_PREFIX	"GVE-"

#ifndef GOOGLE_VENDOR_ID
#define GOOGLE_VENDOR_ID	0x1ae0
#endif

error: patch failed: drivers/net/gve/base/gve.h:9
Checking patch drivers/net/gve/base/gve_adminq.c...
Checking patch drivers/net/gve/base/gve_adminq.h...
Checking patch drivers/net/gve/base/gve_osdep.h...
Hunk #2 succeeded at 74 (offset -4 lines).
Hunk #3 succeeded at 167 (offset -4 lines).
Checking patch drivers/net/gve/gve_ethdev.c...
Hunk #2 succeeded at 257 (offset 20 lines).
Hunk #3 succeeded at 713 (offset -7 lines).
Checking patch drivers/net/gve/gve_ethdev.h...
Hunk #1 succeeded at 222 (offset -46 lines).
Checking patch drivers/net/gve/gve_version.c...
Checking patch drivers/net/gve/gve_version.h...
Checking patch drivers/net/gve/meson.build...
error: while searching for:
        'gve_rx_dqo.c',
        'gve_tx_dqo.c',
        'gve_ethdev.c',
)
includes += include_directories('base')

error: patch failed: drivers/net/gve/meson.build:14
Applying patch drivers/net/gve/base/gve.h with 1 reject...
Rejected hunk #1.
Applied patch drivers/net/gve/base/gve_adminq.c cleanly.
Applied patch drivers/net/gve/base/gve_adminq.h cleanly.
Applied patch drivers/net/gve/base/gve_osdep.h cleanly.
Applied patch drivers/net/gve/gve_ethdev.c cleanly.
Applied patch drivers/net/gve/gve_ethdev.h cleanly.
Applied patch drivers/net/gve/gve_version.c cleanly.
Applied patch drivers/net/gve/gve_version.h cleanly.
Applying patch drivers/net/gve/meson.build with 1 reject...
Hunk #1 applied cleanly.
Rejected hunk #2.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/drivers/net/gve/base/gve.h b/drivers/net/gve/base/gve.h	(rejected hunks)
@@ -9,9 +9,6 @@
 #include "gve_desc.h"
 #include "gve_desc_dqo.h"
 
-#define GVE_VERSION		"1.3.0"
-#define GVE_VERSION_PREFIX	"GVE-"
-
 #ifndef GOOGLE_VENDOR_ID
 #define GOOGLE_VENDOR_ID	0x1ae0
 #endif
diff a/drivers/net/gve/meson.build b/drivers/net/gve/meson.build	(rejected hunks)
@@ -14,5 +14,6 @@ sources = files(
         'gve_rx_dqo.c',
         'gve_tx_dqo.c',
         'gve_ethdev.c',
+        'gve_version.c',
 )
 includes += include_directories('base')

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

UNH-IOL DPDK Community Lab