public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Dave Airlie <airlied@linux•ie>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	"Christian König" <christian.koenig@amd•com>,
	"Daniel Vetter" <daniel.vetter@ffwll•ch>,
	"Gustavo Padovan" <gustavo.padovan@collabora•co.uk>
Subject: linux-next: manual merge of the staging tree with the drm tree
Date: Mon, 20 Jun 2016 14:33:53 +1000	[thread overview]
Message-ID: <20160620143353.03399257@canb.auug.org.au> (raw)

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

             reply	other threads:[~2016-06-20  4:33 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-20  4:33 Stephen Rothwell [this message]
2016-07-25  6:29 ` linux-next: manual merge of the staging tree with the drm tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2018-11-20  2:16 Stephen Rothwell
2018-11-20  8:54 ` Greg KH
2014-03-19  4:22 Stephen Rothwell
2009-03-20  4:38 Stephen Rothwell
2009-03-20  5:15 ` Greg KH
2009-03-20  5:42   ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160620143353.03399257@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=airlied@linux$(echo .)ie \
    --cc=christian.koenig@amd$(echo .)com \
    --cc=daniel.vetter@ffwll$(echo .)ch \
    --cc=greg@kroah$(echo .)com \
    --cc=gustavo.padovan@collabora$(echo .)co.uk \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox