From: Sakari Ailus <sakari.ailus@linux•intel.com>
To: Rob Herring <robherring2@gmail•com>,
Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Mark Brown <broonie@kernel•org>,
Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Kuninori Morimoto <kuninori.morimoto.gx@renesas•com>
Subject: Re: linux-next: manual merge of the devicetree tree with the sound-asoc tree
Date: Wed, 14 Jun 2017 23:52:37 +0300 [thread overview]
Message-ID: <c142b783-c2dd-3e9a-344b-b78dcc38867f@linux.intel.com> (raw)
In-Reply-To: <CAL_Jsq+h8Bx9Ks8K8f6G7JJcouqChUEX40T4xosBdk+1GJiQiQ@mail.gmail.com>
Hi Rob,
Rob Herring wrote:
> On Tue, Jun 13, 2017 at 9:54 PM, Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>> Hi all,
>>
>> Today's linux-next merge of the devicetree tree got a conflict in:
>>
>> drivers/of/base.c
>>
>> between commits:
>>
>> 4c9c3d595f1b ("of_graph: add of_graph_get_remote_endpoint()")
>> 0ef472a973eb ("of_graph: add of_graph_get_port_parent()")
>> ac1e6958d3be ("of_graph: add of_graph_get_endpoint_count()")
>>
>> from the sound-asoc tree and commit:
>>
>> 1df09bc66f9b ("of: Move OF property and graph API from base.c to property.c")
>>
>> from the devicetree tree.
>
> Sakari, I forgot about these other changes and the resolution is more
> complex than I want to pass on to Linus. Has the branch I provided
> been pulled in (I guess not since this is the first I've seen of the
> conflict)? We should drop the move for now and do it late in the merge
> window or post -rc1. It can be after your other changes.
Good that this came up now --- I was about to send a pull request to
Rafael. :-) So no, nothing has been pulled yet that would have included
the immutable branch you provided.
Regarding the fwnode cleanups through linux-pm on the dt/property-move
branch --- I'm ok waiting for the next rc1.
After that I'd like to get them in for I have patches for media-tree (of
which not all are mine) that in turn depend on the fwnode cleanups.
There still have been surprisingly few conflicts so far.
--
Kind regards,
Sakari Ailus
sakari.ailus@linux•intel.com
next prev parent reply other threads:[~2017-06-14 20:52 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-14 2:54 linux-next: manual merge of the devicetree tree with the sound-asoc tree Stephen Rothwell
2017-06-14 13:55 ` Rob Herring
2017-06-14 14:30 ` Mark Brown
2017-06-14 20:52 ` Sakari Ailus [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-03-28 23:32 Stephen Rothwell
2023-03-31 1:47 Stephen Rothwell
2025-08-27 1:48 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=c142b783-c2dd-3e9a-344b-b78dcc38867f@linux.intel.com \
--to=sakari.ailus@linux$(echo .)intel.com \
--cc=broonie@kernel$(echo .)org \
--cc=kuninori.morimoto.gx@renesas$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=robherring2@gmail$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/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