From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Herring <robherring2@gmail.com>,
Rob Herring <robh@kernel.org>, ave Airlie <airlied@linux.ie>,
DRI <dri-devel@lists.freedesktop.org>
Cc: Mark Brown <broonie@kernel.org>,
Frank Rowand <frank.rowand@sony.com>,
Stephen Boyd <stephen.boyd@linaro.org>,
Jyri Sarha <jsarha@ti.com>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the devicetree tree with the drm tree
Date: Mon, 13 Nov 2017 16:58:31 +1100 [thread overview]
Message-ID: <20171113165831.19ebc9fa@canb.auug.org.au> (raw)
In-Reply-To: <20171030203756.35brom4ulrbgqesv@sirena.co.uk>
Hi all,
On Mon, 30 Oct 2017 20:37:56 +0000 Mark Brown <broonie@kernel.org> wrote:
>
> Today's linux-next merge of the devicetree tree got a conflict in:
>
> drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c
>
> between commit:
>
> 44cd3939c111b7 ("drm/tilcdc: Remove redundant OF_DETACHED flag setting")
>
> from the drm tree and commit:
>
> f948d6d8b792bb ("of: overlay: avoid race condition between applying multiple overlays")
>
> from the devicetree tree.
>
> I fixed it up (see below) 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.
>
> diff --cc drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c
> index 482299a6f3b0,54025af534d4..000000000000
> --- a/drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c
> +++ b/drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c
> @@@ -163,12 -162,8 +162,6 @@@ static struct device_node * __init tilc
> return NULL;
> }
>
> - ret = of_resolve_phandles(overlay);
> - if (ret) {
> - pr_err("%s: Failed to resolve phandles: %d\n", __func__, ret);
> - return NULL;
> - }
> - of_node_set_flag(overlay, OF_DETACHED);
> --
> return overlay;
> }
>
Just a reminder that this conflict still exists.
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2017-11-13 5:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-30 20:37 linux-next: manual merge of the devicetree tree with the drm tree Mark Brown
2017-11-13 5:58 ` Stephen Rothwell [this message]
2017-11-13 15:40 ` Jyri Sarha
2017-11-13 18:43 ` Frank Rowand
2017-11-13 19:51 ` Jyri Sarha
2017-11-20 7:41 ` Daniel Vetter
2020-05-04 3:52 Stephen Rothwell
2020-07-22 5:52 Stephen Rothwell
2020-08-06 1:48 ` Stephen Rothwell
2024-05-14 4:12 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=20171113165831.19ebc9fa@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=airlied@linux.ie \
--cc=broonie@kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=frank.rowand@sony.com \
--cc=jsarha@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=robh@kernel.org \
--cc=robherring2@gmail.com \
--cc=stephen.boyd@linaro.org \
/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).