Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactoring Microchip PCIe driver and add StarFive PCIe #350

Closed
wants to merge 1 commit into from

Conversation

bjoto
Copy link

@bjoto bjoto commented Dec 6, 2023

Pull request for series with
subject: dt-bindings: PCI: Add PLDA XpressRICH PCIe host common properties
version: 12
url: https://patchwork.kernel.org/project/linux-riscv/list/?series=807371

@bjoto
Copy link
Author

bjoto commented Dec 6, 2023

Upstream branch: b85ea95
series: https://patchwork.kernel.org/project/linux-riscv/list/?series=807371
version: 12

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/linux-riscv/list/?series=807371
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am -s --3way
  stdout: 'Applying: dt-bindings: PCI: Add PLDA XpressRICH PCIe host common properties
Applying: PCI: microchip: Rename two PCIe data structures
Patch failed at 0002 PCI: microchip: Rename two PCIe data structures
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".'
  stderr: 'error: sha1 information is lacking or useless (drivers/pci/controller/plda/pcie-microchip-host.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch'

conflict:


@bjoto bjoto changed the title dt-bindings: PCI: Add PLDA XpressRICH PCIe host common properties Refactoring Microchip PCIe driver and add StarFive PCIe Dec 6, 2023
@bjoto
Copy link
Author

bjoto commented Dec 6, 2023

At least one diff in series https://patchwork.kernel.org/project/linux-riscv/list/?series=807371 irrelevant now. Closing PR.

@bjoto bjoto closed this Dec 6, 2023
@bjoto bjoto deleted the series/807371=>fixes branch December 12, 2023 12:24
bjoto pushed a commit that referenced this pull request May 31, 2024
Add a test case to assert that the skb->pkt_type which was set from the BPF
program is retained from the netkit xmit side to the peer's device at tcx
ingress location.

  # ./vmtest.sh -- ./test_progs -t netkit
  [...]
  ./test_progs -t netkit
  [    1.140780] bpf_testmod: loading out-of-tree module taints kernel.
  [    1.141127] bpf_testmod: module verification failed: signature and/or required key missing - tainting kernel
  [    1.284601] tsc: Refined TSC clocksource calibration: 3408.006 MHz
  [    1.286672] clocksource: tsc: mask: 0xffffffffffffffff max_cycles: 0x311fd9b189d, max_idle_ns: 440795225691 ns
  [    1.290384] clocksource: Switched to clocksource tsc
  #345     tc_netkit_basic:OK
  #346     tc_netkit_device:OK
  #347     tc_netkit_multi_links:OK
  #348     tc_netkit_multi_opts:OK
  #349     tc_netkit_neigh_links:OK
  #350     tc_netkit_pkt_type:OK
  Summary: 6/0 PASSED, 0 SKIPPED, 0 FAILED

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/r/20240524163619.26001-4-daniel@iogearbox.net
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
1 participant