Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6;
Date:   Thu, 28 Sep 2023 12:05:59 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Dave Airlie <airlied@redhat.com>,
        Daniel Vetter <daniel.vetter@ffwll.ch>
Cc:     Intel Graphics <intel-gfx@lists.freedesktop.org>,
        DRI <dri-devel@lists.freedesktop.org>,
        Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>,
        Karol Wachowski <karol.wachowski@linux.intel.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Subject: linux-next: manual merge of the drm tree with the drm-misc-fixes
 tree
Message-ID: <20230928120559.485eecd7@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/AI36QvNyIPurJhqGZN8m9Qs";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/AI36QvNyIPurJhqGZN8m9Qs
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/accel/ivpu/ivpu_fw.c

between commit:

  645d694559ca ("accel/ivpu: Use cached buffers for FW loading")

from the drm-misc-fixes tree and commit:

  53d98420f5f9 ("accel/ivpu: Move ivpu_fw_load() to ivpu_fw_init()")

from the drm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

--=20
Cheers,
Stephen Rothwell

diff --cc drivers/accel/ivpu/ivpu_fw.c
index 0191cf8e5964,d57e103aae1c..000000000000
--- a/drivers/accel/ivpu/ivpu_fw.c
+++ b/drivers/accel/ivpu/ivpu_fw.c
@@@ -331,9 -332,7 +333,7 @@@ void ivpu_fw_load(struct ivpu_device *v
  		memset(start, 0, size);
  	}
 =20
 -	wmb(); /* Flush WC buffers after writing fw->mem */
 +	clflush_cache_range(fw->mem->kvaddr, fw->mem->base.size);
-=20
- 	return 0;
  }
 =20
  static void ivpu_fw_boot_params_print(struct ivpu_device *vdev, struct vp=
u_boot_params *boot_params)

--Sig_/AI36QvNyIPurJhqGZN8m9Qs
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUU34cACgkQAVBC80lX
0Gx0vQf/YgJqpqoaLiWKBT81dUyyFB/aKPq0CvJARdYNvmu3n69BhK3qN+64FX4T
VQzi4wCZwgvErmnv1cJ83WliDY+UXTz/nTHNfzfttjI2nNbA9Lfc4qSRahhM/SXV
AlbD8wXdwTCm0MojHra6QXM8UiGafGbf+7PS9MadQ92WdCw+J3FCAZfCeWxSSo0U
QH5/EQ11G2NdmtkgMaSD2MCOW0vGoYfnfSjteHbcx/pak2hGKk+NBRWKcC5KagoV
SuRagK+4/Vn8Oy/g/lAb9SiiacZdjBzs9RftJyfJy2NXITTzOKYdok01IRRHVKpM
SK43I5VBEzCypRbTTDU7k88bCHe+mA==
=TbLq
-----END PGP SIGNATURE-----

--Sig_/AI36QvNyIPurJhqGZN8m9Qs--