<html><body><div id="edo-message"><div></div>Listen, here’s the problem I’m having guys and I need someone to reply back to me. Because I wrote to FSF and they wrote me right back and I join their and I have no problem with free software and complain but I don’t exactly know what you want me to do and I don’t have “git” on my windows computer. And it seems like you guys are making it hard for me to do anything in the first place I can’t even connect to the Internet can someone help me out?</div><div id="edo-meta"><div id="edo-signature" style="font-family: sans-serif, 'Helvetica Neue', Helvetica, Arial;">what problem am I resolving<div></div></div></div><div id="edo-original"><div><br><br><blockquote type="cite" style="margin:1ex 0 0 0; height: min-content; border-left:1px #ccc solid;padding-left:0.5ex;"><div>On Jun 20, 2023 at 7:55 PM, <<a href="mailto:patchwork@emeril.freedesktop.org">Patchwork</a>> wrote:<br><br></div><div><pre>== Series Details ==
Series: drm/i915:fix kernel-doc trivial warnings
URL : https://patchwork.freedesktop.org/series/119620/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/119620/revisions/1/mbox/ not applied
Applying: drm/i915:fix kernel-doc trivial warnings
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_active.h
M drivers/gpu/drm/i915/i915_gpu_error.c
M drivers/gpu/drm/i915/i915_perf.c
M drivers/gpu/drm/i915/i915_scatterlist.h
M drivers/gpu/drm/i915/i915_utils.h
M drivers/gpu/drm/i915/i915_vma_resource.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_vma_resource.h
Auto-merging drivers/gpu/drm/i915/i915_utils.h
Auto-merging drivers/gpu/drm/i915/i915_scatterlist.h
Auto-merging drivers/gpu/drm/i915/i915_perf.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_perf.c
Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gpu_error.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 drm/i915:fix kernel-doc trivial warnings
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".
Build failed, no error log produced
</pre></div></blockquote></div></div></body></html>