From: dpdklab@iol.unh.edu
To: test-report@dpdk.org
Cc: dpdk-test-reports@iol.unh.edu
Subject: |WARNING| pw138208 [PATCH] [stable-22.11] kni: fix build with Linux 6.8
Date: Tue, 12 Mar 2024 03:31:22 -0700 (PDT) [thread overview]
Message-ID: <65f02efa.050a0220.5feb9.be48SMTPIN_ADDED_MISSING@mx.google.com> (raw)
In-Reply-To: <20240312084914.92056-1-jslaby@suse.cz>
Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/138208
_apply patch failure_
Submitter: Jiri Slaby <jslaby@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
prev parent reply other threads:[~2024-03-12 10:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20240312084914.92056-1-jslaby@suse.cz>
2024-03-12 8:33 ` |WARNING| pw138208 [PATCH stable-22.11] " qemudev
2024-03-12 8:57 ` checkpatch
2024-03-12 10:31 ` dpdklab [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=65f02efa.050a0220.5feb9.be48SMTPIN_ADDED_MISSING@mx.google.com \
--to=dpdklab@iol.unh.edu \
--cc=dpdk-test-reports@iol.unh.edu \
--cc=test-report@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).