|WARNING| pw138208 [PATCH] [stable-22.11] kni: fix build with Linux 6.8

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Jiri Slaby <jslaby at suse.cz>
Date: Tuesday, March 12 2024 08:49:14 
Applied on: CommitID:a86f381b826660e88794754c41d3aec79ce9b87c
Apply patch set 138208 failed:

Cloning the DPDK mirror at: https://github.com/DPDK/dpdk.git (Attempt 1 of 3)
Trying to checkout branch: origin/main
Checked out to main (a86f381b826660e88794754c41d3aec79ce9b87c)
Done: main commit a86f381b826660e88794754c41d3aec79ce9b87c
Trying to checkout branch: origin/main
Checked out to main (a86f381b826660e88794754c41d3aec79ce9b87c)
Applying patch...

Failed to apply patch:
Applying: kni: fix build with Linux 6.8
Using index info to reconstruct a base tree...
A	kernel/linux/kni/kni_net.c
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): kernel/linux/kni/kni_net.c deleted in HEAD and modified in kni: fix build with Linux 6.8. Version kni: fix build with Linux 6.8 of kernel/linux/kni/kni_net.c left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 kni: fix build with Linux 6.8
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".


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

UNH-IOL DPDK Community Lab