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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 789 bytes --]

Hi all,

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

  drivers/gpu/drm/tests/drm_buddy_test.c

between commit:

  fca7526b7d89 ("drm/tests/drm_buddy: fix build failure on 32-bit targets")

from Linus' tree and commit:

  335126937753 ("drm/tests/drm_buddy: fix 32b build")

from the drm-misc-fixes tree.

I fixed it up (I just used the version from Linus' tree) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1896 bytes --]

Hi all,

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

  drivers/dma-buf/dma-buf.c

between commit:

  28743e25fa1c ("dma-buf: Remove obsoleted internal lock")

from Linus' tree and commit:

  f728a5ea27c9 ("dma-buf: fix dma_buf_export init order v2")

from the drm-misc-fixes 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/dma-buf/dma-buf.c
index b6c36914e7c6,eb6b59363c4f..000000000000
--- a/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c
@@@ -658,23 -655,24 +660,23 @@@ struct dma_buf *dma_buf_export(const st
  	init_waitqueue_head(&dmabuf->poll);
  	dmabuf->cb_in.poll = dmabuf->cb_out.poll = &dmabuf->poll;
  	dmabuf->cb_in.active = dmabuf->cb_out.active = 0;
 -	mutex_init(&dmabuf->lock);
+ 	INIT_LIST_HEAD(&dmabuf->attachments);
  
  	if (!resv) {
- 		resv = (struct dma_resv *)&dmabuf[1];
- 		dma_resv_init(resv);
+ 		dmabuf->resv = (struct dma_resv *)&dmabuf[1];
+ 		dma_resv_init(dmabuf->resv);
+ 	} else {
+ 		dmabuf->resv = resv;
  	}
- 	dmabuf->resv = resv;
  
- 	file = dma_buf_getfile(dmabuf, exp_info->flags);
- 	if (IS_ERR(file)) {
- 		ret = PTR_ERR(file);
+ 	ret = dma_buf_stats_setup(dmabuf, file);
+ 	if (ret)
  		goto err_dmabuf;
- 	}
  
+ 	file->private_data = dmabuf;
+ 	file->f_path.dentry->d_fsdata = dmabuf;
  	dmabuf->file = file;
  
- 	INIT_LIST_HEAD(&dmabuf->attachments);
- 
  	mutex_lock(&db_list.lock);
  	list_add(&dmabuf->list_node, &db_list.head);
  	mutex_unlock(&db_list.lock);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 841 bytes --]

Hi all,

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

  drivers/gpu/drm/vc4/vc4_hdmi.c

between commit:

  b1044a9b8100 ("Revert drm/vc4 hdmi runtime PM changes")

from Linus' tree and commits:

  36e9bcb8edfc ("drm/vc4: select PM")
  a22dad7fa0cd ("drm/vc4: hdmi: Rework the pre_crtc_configure error handling")

from the drm-misc-fixes tree.

I fixed it up (I just effectively reverted the change in Linus' tree) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]