Subject: linux-next: manual merge of the drm tree with the drm-misc-fixes tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 28 Sep 2023 12:05:59 +1000

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.

-- 
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);
  	}
  
 -	wmb(); /* Flush WC buffers after writing fw->mem */
 +	clflush_cache_range(fw->mem->kvaddr, fw->mem->base.size);
- 
- 	return 0;
  }
  
  static void ivpu_fw_boot_params_print(struct ivpu_device *vdev, struct vpu_boot_params *boot_params)