From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Lucas Stach <l.stach@pengutronix.de>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Fernando Ramos <greenfoo@gluegarage.com>,
Linus Walleij <linus.walleij@linaro.org>,
Thomas Zimmermann <tzimmermann@suse.de>
Subject: linux-next: manual merge of the etnaviv tree with the drm-misc tree
Date: Mon, 26 Nov 2018 13:58:06 +1100 [thread overview]
Message-ID: <20181126135806.22f4ce78@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 822 bytes --]
Hi Lucas,
Today's linux-next merge of the etnaviv tree got a conflict in:
drivers/gpu/drm/etnaviv/etnaviv_drv.c
between commit:
808bad32ea42 ("drm: replace "drm_dev_unref" function with "drm_dev_put"")
from the drm-misc tree and commit:
99e294492ef9 ("drm/etnaviv: Replace drm_dev_unref with drm_dev_put")
from the etnaviv tree.
I fixed it up (I used the latter which also renamed a label
appropriatedly) 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 --]
next reply other threads:[~2018-11-26 2:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-26 2:58 Stephen Rothwell [this message]
2019-08-14 3:20 linux-next: manual merge of the etnaviv tree with the drm-misc tree 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=20181126135806.22f4ce78@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=greenfoo@gluegarage.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=l.stach@pengutronix.de \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).