From: philly j <cyberchefed@onmail.com>
To: Intel-Gfx <intel-gfx@lists.freedesktop.org>
Subject: Re: [Intel-gfx] (no subject)
Date: Tue, 20 Jun 2023 20:05:21 -0400 [thread overview]
Message-ID: <1BA84479-B9DA-4CD8-883E-A65A38BFD22F@edison.tech> (raw)
In-Reply-To: <168730535457.10443.17450013087747753237@emeril.freedesktop.org>
[-- Attachment #1: Type: text/plain, Size: 2128 bytes --]
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?
what problem am I resolving
>
> On Jun 20, 2023 at 7:55 PM, <Patchwork (mailto:patchwork@emeril.freedesktop.org)> wrote:
>
>
>
> == 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
>
>
[-- Attachment #2: Type: text/html, Size: 2505 bytes --]
next prev parent reply other threads:[~2023-06-21 0:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-24 10:23 [Intel-gfx] [PATCH] drm/i915:fix kernel-doc trivial warnings pengfuyuan
2023-05-24 11:24 ` Jani Nikula
2023-06-20 23:55 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " Patchwork
2023-06-21 0:05 ` philly j [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-09-22 23:31 [Intel-gfx] (no subject) Alan Previn
[not found] <20220519095508.115203-1-christian.koenig@amd.com>
2022-05-19 10:50 ` Matthew Auld
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=1BA84479-B9DA-4CD8-883E-A65A38BFD22F@edison.tech \
--to=cyberchefed@onmail.com \
--cc=intel-gfx@lists.freedesktop.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