linux-next: manual merge of the staging tree with the drm tree

linux-next: manual merge of the staging tree with the drm tree

[Stephen Rothwell]

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

Hi Greg,

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

  drivers/staging/vboxvideo/vbox_ttm.c

between commits:

  a64f784bb14a ("drm/ttm: initialize globals during device init (v2)")

from the drm tree and commit:

  cd76c287a52f ("staging: vboxvideo: Cleanup the comments")

from the staging tree.

I fixed it up (the former removed the comments updated by the latter) 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 --]

Re: linux-next: manual merge of the staging tree with the drm tree

[Greg KH]

On Tue, Nov 20, 2018 at 01:16:16PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/vboxvideo/vbox_ttm.c
> 
> between commits:
> 
>   a64f784bb14a ("drm/ttm: initialize globals during device init (v2)")
> 
> from the drm tree and commit:
> 
>   cd76c287a52f ("staging: vboxvideo: Cleanup the comments")
> 
> from the staging tree.
> 
> I fixed it up (the former removed the comments updated by the latter) 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.

Fix seems sane to me, thanks.

greg k-h

Re: linux-next: manual merge of the staging tree with the drm tree

[Stephen Rothwell]

Hi all,

On Mon, 20 Jun 2016 14:33:53 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/android/sync.h
> 
> between commit:
> 
>   76bf0db55439 ("dma-buf/fence: make fence context 64 bit v2")
> 
> from the drm tree and commits:
> 
>   342952d3a5c4 ("staging/android: remove 'destroyed' member from struct sync_timeline")
>   1fe82e2e1486 ("staging/android: rename sync.h to sync_debug.h")
> 
> from the staging tree.
> 
> I fixed it up (I removed the file and applied the following fix patch)
> 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.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 20 Jun 2016 14:28:29 +1000
> Subject: [PATCH] staging/android: merge fix up for sync.h renaming
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/staging/android/sync_debug.h | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/staging/android/sync_debug.h b/drivers/staging/android/sync_debug.h
> index 425ebc5c32aa..fab66396d421 100644
> --- a/drivers/staging/android/sync_debug.h
> +++ b/drivers/staging/android/sync_debug.h
> @@ -34,7 +34,8 @@ struct sync_timeline {
>  	char			name[32];
>  
>  	/* protected by child_list_lock */
> -	int			context, value;
> +	u64			context;
> +	int			value;
>  
>  	struct list_head	child_list_head;
>  	spinlock_t		child_list_lock;
> -- 
> 2.8.1

Since Linus has merged the staging tree, this extra merge resolution
will now be needed when the drm tree is merged with Linus' tree.

-- 
Cheers,
Stephen Rothwell

linux-next: manual merge of the staging tree with the drm tree

[Stephen Rothwell]

Hi Greg,

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

  drivers/staging/android/sync.h

between commit:

  76bf0db55439 ("dma-buf/fence: make fence context 64 bit v2")

from the drm tree and commits:

  342952d3a5c4 ("staging/android: remove 'destroyed' member from struct sync_timeline")
  1fe82e2e1486 ("staging/android: rename sync.h to sync_debug.h")

from the staging tree.

I fixed it up (I removed the file and applied the following fix patch)
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.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 20 Jun 2016 14:28:29 +1000
Subject: [PATCH] staging/android: merge fix up for sync.h renaming

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/staging/android/sync_debug.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/android/sync_debug.h b/drivers/staging/android/sync_debug.h
index 425ebc5c32aa..fab66396d421 100644
--- a/drivers/staging/android/sync_debug.h
+++ b/drivers/staging/android/sync_debug.h
@@ -34,7 +34,8 @@ struct sync_timeline {
 	char			name[32];
 
 	/* protected by child_list_lock */
-	int			context, value;
+	u64			context;
+	int			value;
 
 	struct list_head	child_list_head;
 	spinlock_t		child_list_lock;
-- 
2.8.1

-- 
Cheers,
Stephen Rothwell

linux-next: manual merge of the staging tree with the drm tree

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the staging tree got conflicts in
drivers/staging/imx-drm/imx-hdmi.c, drivers/staging/imx-drm/imx-ldb.c,
drivers/staging/imx-drm/imx-tve.c and
drivers/staging/imx-drm/parallel-display.c between commits 69fa5293bf8d
("drm/kms: rip out drm_mode_connector_detach_encoder") and fc1645ac826c
("drm/imx: remove drm_mode_connector_detach_encoder harder") from the drm
tree and commit 1b3f76756633 ("imx-drm: initialise drm components
directly") from the staging tree.

I fixed it up (I used the staging tree version as it was a superset of
the drm tree version) and can carry the fix as necessary (no action is
required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]