From: Jonathan =?utf-8?Q?Neusch=C3=A4fer?= Subject: Re: =?utf-8?b?4pyXIEZpLkNJLkJVSUxEOiBmYWlsdXJlIGZvciBk?= =?utf-8?q?rm/i915=3A_Add_Sphinx-compatible_references_to_struct_fields?= Date: Fri, 4 Oct 2019 15:26:20 +0200 Message-ID: <20191004132620.GB19803@latitude> References: <20191003172823.8955-1-j.neuschaefer@gmx.net> <20191003184556.3225.20950@emeril.freedesktop.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1491481185==" Return-path: Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1500A6EB7B for ; Fri, 4 Oct 2019 13:26:23 +0000 (UTC) In-Reply-To: <20191003184556.3225.20950@emeril.freedesktop.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: Jonathan =?utf-8?Q?Neusch=C3=A4fer?= List-Id: intel-gfx@lists.freedesktop.org --===============1491481185== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="6sX45UoQRIJXqkqR" Content-Disposition: inline --6sX45UoQRIJXqkqR Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Oct 03, 2019 at 06:45:56PM -0000, Patchwork wrote: > =3D=3D Series Details =3D=3D >=20 > Series: drm/i915: Add Sphinx-compatible references to struct fields > URL : https://patchwork.freedesktop.org/series/67550/ > State : failure >=20 > =3D=3D Summary =3D=3D >=20 > Applying: drm/i915: Add Sphinx-compatible references to struct fields > Using index info to reconstruct a base tree... > M drivers/gpu/drm/i915/i915_drv.h > Falling back to patching base and 3-way merge... > Auto-merging drivers/gpu/drm/i915/i915_drv.h > CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h I'm not sure what's wrong here. The patch applies cleanly to v5.4-rc1 and linux-next. Maybe patchwork is applying it to an older base? Thanks, Jonathan Neusch=C3=A4fer --6sX45UoQRIJXqkqR Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEvHAHGBBjQPVy+qvDCDBEmo7zX9sFAl2XSHMACgkQCDBEmo7z X9sugg//dYEfhgU5ERk2RVSyn/1yA3UeSz0CJ2mrEVE3k/HCP4h1XqsVgOcroNuh 8IqMdySg+lJLMR4wfEbTUox7rOPDY5UkpOcEJP4w/1El+mKFaoRYxGGDoghzmNm7 VqY5PRcq83jspM9ovCgzi6E8Joh5x2t2M3yFN2DF4kcfWoLQJ2Rk4/AGo+NXQlEM eWA/QLB/K7UaYt1AKMNatFzZ+h7a9o9/BTY/vWUrgegRh6lY0vpiImoFOeC5rXs0 a1NTGWW5EYxoCIbhKbXQFwLHQoEFk3njBgSJTvvs4fcyXj/UH4Qy8yueE1T8+DTq U0hlN8XBYCJzksWSW+c04/50pJHn/QTtDs3gYhlbulsS0B+AQN7LEypQwgPEh/BT 99j6ZHNreJvolEwSurxZhpAYokChqa9mz9VtjW/wVFf33WmrKq1iBXmZI/P/HsAe AbbXwvybeyJ/6N1QJQ5toDXsPIrhTOpdB6I/zeXFzYJGtX3gRDjayYWaE+wTo1PY jPhqFId9D+e9B16TxJhnchmTWqkseZrKsX+0oNoN96uerf+qWwMxD2mpn6ytV9tW QdBluKpE8fajBjyTLL96722mKicZkCkzDlOtbWO5aa3NfOyYzQ+NzuOQU0OayP3k Vx6rlDkYPSk7W0z9OXE2NLso8c48hYghUCP3SH4evLk7zsr7t24= =Mj5c -----END PGP SIGNATURE----- --6sX45UoQRIJXqkqR-- --===============1491481185== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 --===============1491481185==--