From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <intel-gfx-bounces@lists.freedesktop.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.lore.kernel.org (Postfix) with ESMTPS id 0A586EB64D7
	for <intel-gfx@archiver.kernel.org>; Wed, 21 Jun 2023 00:43:57 +0000 (UTC)
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
	by gabe.freedesktop.org (Postfix) with ESMTP id 8CA6910E386;
	Wed, 21 Jun 2023 00:43:56 +0000 (UTC)
X-Greylist: delayed 2311 seconds by postgrey-1.36 at gabe;
 Wed, 21 Jun 2023 00:43:55 UTC
Received: from mail-ue1-f01.onmail.com (mail-ue1-f01.onmail.com
 [3.228.221.170])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 278B610E386
 for <intel-gfx@lists.freedesktop.org>; Wed, 21 Jun 2023 00:43:54 +0000 (UTC)
Received: from localhost (unknown [174.120.105.80])
 by onmail.com (Postfix) with UTF8SMTP id 53A0C260005
 for <intel-gfx@lists.freedesktop.org>; Tue, 20 Jun 2023 17:05:23 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 s=mail; d=onmail.com; h=mime-version:date:from:subject:to:message-id:
 cc; bh=160B9wZ2ZKDOZ391ScMbVNhU01Nwdufq4YpIhMawbjM=;
 b=pKLwltGiezyv/FJVnyNV6hcCgMqDtmNI5BZApweqeedPvgdFwTLe7x4/vJ2vMzMKgNwDCU
 YA9G0u1P0YcyDM+8LONR7r2LvsQneoHPc/oFuV9hozaGWpKqO5y4gzxFyNcXvnPNj/vK8M
 Jki4FgXSqtJGoW19aVYAKoWL9qQTQ95KYKEVKsP+568YdpwETG8g5hRNer/mBC8aReWVbH
 R6cQwdN/vANNMe6Pgh/PEgSVwWfS7W/XhFnZvQw4AFYOK5/2Tnw1i8lAK+99wpGVj13T7B
 HuFNxcqXa8gyigMuV6gDkZ3H/Ow/U2ktm5tnoZdxTrNoGjwXcgSh7jTKAlranA==
Date: Tue, 20 Jun 2023 20:05:21 -0400
From: philly j <cyberchefed@onmail.com>
To: Intel-Gfx <intel-gfx@lists.freedesktop.org>
Message-ID: <1BA84479-B9DA-4CD8-883E-A65A38BFD22F@edison.tech>
In-Reply-To: <168730535457.10443.17450013087747753237@emeril.freedesktop.org>
References: <20230524102332.1483249-1-pengfuyuan@kylinos.cn>
 <168730535457.10443.17450013087747753237@emeril.freedesktop.org>
MIME-Version: 1.0
Content-Type: multipart/alternative; boundary=64923ec1_1d280be5_19e7
X-Em-Message-ID: +vWwoEkRofwGPd1gUIy3S+bzzhmGjLY92IRvXM+S8Jw=
Subject: Re: [Intel-gfx] (no subject)
X-BeenThere: intel-gfx@lists.freedesktop.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Intel graphics driver community testing & development
 <intel-gfx.lists.freedesktop.org>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>

--64923ec1_1d280be5_19e7
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

     =20
 =20

 Listen, here=E2=80=99s the problem I=E2=80=99m having guys and I need some=
one to reply back to me. Because I wrote to FSF and they wrote me right bac=
k and I join their and I have no problem with free software and complain bu=
t I don=E2=80=99t exactly know what you want me to do and I don=E2=80=99t h=
ave =E2=80=9Cgit=E2=80=9D   on my windows computer. And it seems like you g=
uys are making it hard for me to do anything in the first place I can=E2=80=
=99t even connect to the Internet can someone help me out?
 =20
 =20
what problem am I    resolving =20

 =20
 =20
 =20
 =20

 =20
 =20
>  =20
> On Jun 20, 2023 at 7:55 PM,  <Patchwork (mailto:patchwork@emeril.freedesk=
top.org)>  wrote:
>  =20
>  =20
>  =20
>  =3D=3D Series Details =3D=3D Series: drm/i915:fix kernel-doc trivial war=
nings URL : https://patchwork.freedesktop.org/series/119620/ State : failur=
e =3D=3D Summary =3D=3D Error: patch https://patchwork.freedesktop.org/api/=
1.0/series/119620/revisions/1/mbox/ not applied Applying: drm/i915:fix kern=
el-doc trivial warnings Using index info to reconstruct a base tree... M dr=
ivers/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_resourc=
e.h Falling back to patching base and 3-way merge... Auto-merging drivers/g=
pu/drm/i915/i915_vma_resource.h Auto-merging drivers/gpu/drm/i915/i915_util=
s.h Auto-merging drivers/gpu/drm/i915/i915_scatterlist.h Auto-merging drive=
rs/gpu/drm/i915/i915_perf.c CONFLICT (content): Merge conflict in drivers/g=
pu/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-pa=
tch=3Ddiff' to see the failed patch Patch failed at 0001 drm/i915:fix kerne=
l-doc trivial warnings When you have resolved this problem, run "git am --c=
ontinue". 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 =20
>
>  =20
 =20
 =20

--64923ec1_1d280be5_19e7
Content-Type: text/html; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

<html><body><div id=3D"edo-message"><div></div>Listen, here=E2=80=99s the p=
roblem I=E2=80=99m having guys and I need someone to reply back to me. Beca=
use 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=E2=80=99t exactly kno=
w what you want me to do and I don=E2=80=99t have =E2=80=9Cgit=E2=80=9D&nbs=
p;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=E2=80=99t even connect to the I=
nternet can someone help me out?</div><div id=3D"edo-meta"><div id=3D"edo-s=
ignature" style=3D"font-family: sans-serif, 'Helvetica Neue', Helvetica, Ar=
ial;">what problem am I&nbsp; resolving<div></div></div></div><div id=3D"ed=
o-original"><div><br><br><blockquote type=3D"cite" style=3D"margin:1ex 0 0 =
0; height: min-content; border-left:1px #ccc solid;padding-left:0.5ex;"><di=
v>On Jun 20, 2023 at 7:55 PM, &lt;<a href=3D"mailto:patchwork@emeril.freede=
sktop.org">Patchwork</a>&gt; wrote:<br><br></div><div><pre>=3D=3D Series De=
tails =3D=3D

Series: drm/i915:fix kernel-doc trivial warnings
URL   : https://patchwork.freedesktop.org/series/119620/
State : failure

=3D=3D Summary =3D=3D

Error: patch https://patchwork.freedesktop.org/api/1.0/series/119620/revisi=
ons/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=3Ddiff' 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>
--64923ec1_1d280be5_19e7--