Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Mon, 20 Nov 2017 08:41:30 +0100
From:   Daniel Vetter <daniel@ffwll.ch>
To:     Jyri Sarha <jsarha@ti.com>
Cc:     Frank Rowand <frowand.list@gmail.com>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Rob Herring <robherring2@gmail.com>,
        Rob Herring <robh@kernel.org>, ave Airlie <airlied@linux.ie>,
        DRI <dri-devel@lists.freedesktop.org>,
        Mark Brown <broonie@kernel.org>,
        Frank Rowand <frank.rowand@sony.com>,
        Stephen Boyd <stephen.boyd@linaro.org>,
        Linux-Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Daniel Vetter <daniel@ffwll.ch>,
        "Valkeinen, Tomi" <tomi.valkeinen@ti.com>
Subject: Re: linux-next: manual merge of the devicetree tree with the drm tree
Message-ID: <20171120074129.sy6gyfaqhqbch4hy@phenom.ffwll.local>
Mail-Followup-To: Jyri Sarha <jsarha@ti.com>,
        Frank Rowand <frowand.list@gmail.com>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Rob Herring <robherring2@gmail.com>, Rob Herring <robh@kernel.org>,
        ave Airlie <airlied@linux.ie>,
        DRI <dri-devel@lists.freedesktop.org>,
        Mark Brown <broonie@kernel.org>,
        Frank Rowand <frank.rowand@sony.com>,
        Stephen Boyd <stephen.boyd@linaro.org>,
        Linux-Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        "Valkeinen, Tomi" <tomi.valkeinen@ti.com>
References: <20171030203756.35brom4ulrbgqesv@sirena.co.uk>
 <20171113165831.19ebc9fa@canb.auug.org.au>
 <153e4593-2ebb-c091-49c8-b8d44d5caeb5@ti.com>
 <917c5115-3d36-92bd-2713-5a6119fc82ca@gmail.com>
 <6e7a5a3e-c5a9-7069-74bc-06037761af93@ti.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <6e7a5a3e-c5a9-7069-74bc-06037761af93@ti.com>
User-Agent: NeoMutt/20170609 (1.8.3)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Mon, Nov 13, 2017 at 09:51:29PM +0200, Jyri Sarha wrote:
> On 11/13/17 20:43, Frank Rowand wrote:
> > Hi Jyri,
> > 
> > On 11/13/17 07:40, Jyri Sarha wrote:
> >> On 11/13/17 07:58, Stephen Rothwell wrote:
> >>> 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.
> >>>
> >> After some consideration, I think we can drop the dts backward
> >> compatibility code from drm/tilcdc. It seems that it is causing a lot of
> >> trouble and I do not even know if anybody uses it anymore. Here is a
> >> patch for dropping it:
> >>
> >> https://lists.freedesktop.org/archives/dri-devel/2017-November/157394.html
> >>
> >> I did not plan to merge it before v4.16, but if this is a bigger problem
> >> I can push is right now for v4.15.
> >>
> >> Best regards,
> >> Jyri
> >>
> > The dropping patch is much appreciated.
> > 
> > It would make life easier for me if the patch gets into v4.15-rc.
> 
> Dave, Daniel? Would you take this late addition to v4.15 still, if I
> would send a pull request now?
> 
> The patch is pretty much orthogonal to the rest of drm as it is only
> dealing with device tree stuff.

Seems like a reasonable thing to include in the merge window -fixes pull
Dave usually does, just make sure all the acks are recorded.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

From 1583981798573695930@xxx Mon Nov 13 19:52:38 +0000 2017
X-GM-THRID: 1582716362758856630
X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread