From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Maxime Ripard <maxime.ripard@free-electrons•com>,
Daniel Vetter <daniel.vetter@ffwll•ch>,
intel-gfx@lists•freedesktop.org, dri-devel@lists•freedesktop.org
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Chris Wilson <chris@chris-wilson•co.uk>
Subject: linux-next: manual merge of the sunxi tree with the drm-misc tree
Date: Thu, 23 Jun 2016 12:59:14 +1000 [thread overview]
Message-ID: <20160623125914.22b83979@canb.auug.org.au> (raw)
Hi Maxime,
Today's linux-next merge of the sunxi tree got a conflict in:
drivers/gpu/drm/sun4i/sun4i_drv.c
between commit:
366e292df678 ("drm/sun4i: Remove open-coded drm_connector_register_all()")
from the drm-misc tree and commit:
7aa2e2b731b3 ("drm/sun4i: Convert to connector register helpers")
from the sunxi tree.
I fixed it up (I just removed the drm_connector_register_all call as
in the former) 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
next reply other threads:[~2016-06-23 2:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-23 2:59 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-03-06 23:59 linux-next: manual merge of the sunxi tree with the drm-misc tree Stephen Rothwell
2017-03-07 3:05 ` Chen-Yu Tsai
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=20160623125914.22b83979@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=chris@chris-wilson$(echo .)co.uk \
--cc=daniel.vetter@ffwll$(echo .)ch \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=intel-gfx@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maxime.ripard@free-electrons$(echo .)com \
/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