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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 25 Jul 2016 16:29:12 +1000

Hi all,

On Mon, 20 Jun 2016 14:33:53 +1000 Stephen Rothwell <[email-masked]> 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 <[email-masked]>
> 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 <[email-masked]>
> ---
>  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