linux-next: manual merge of the drm-misc tree with Linus' tree

[Stephen Rothwell]

Hi all,

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

  drivers/accel/ivpu/ivpu_ipc.c

between commit:

  b0873eead1d1 ("accel/ivpu: Do not use wait event interruptible")

from Linus' tree and commit:

  57c7e3e4800a ("accel/ivpu: Stop job_done_thread on suspend")

from the drm-misc 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_ipc.c
index a4ca40b184d4,618dbc17df80..000000000000
--- a/drivers/accel/ivpu/ivpu_ipc.c
+++ b/drivers/accel/ivpu/ivpu_ipc.c
@@@ -210,10 -227,9 +227,9 @@@ int ivpu_ipc_receive(struct ivpu_devic
  	struct ivpu_ipc_rx_msg *rx_msg;
  	int wait_ret, ret = 0;
  
 -	wait_ret = wait_event_interruptible_timeout(cons->rx_msg_wq,
 -						    ivpu_ipc_rx_need_wakeup(cons),
 -						    msecs_to_jiffies(timeout_ms));
 +	wait_ret = wait_event_timeout(cons->rx_msg_wq,
- 				      (IS_KTHREAD() && kthread_should_stop()) ||
- 				      !list_empty(&cons->rx_msg_list),
++				      ivpu_ipc_rx_need_wakeup(cons),
 +				      msecs_to_jiffies(timeout_ms));
  
  	if (IS_KTHREAD() && kthread_should_stop())
  		return -EINTR;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20231114/c98462af/attachment.sig>