Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1665862

Re: linux-next: manual merge of the devicetree tree with the sound-asoc tree

Show all headers | View raw

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.

Rob

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the devicetree tree with the sound-asoc  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-14 05:00 +0200
  Re: linux-next: manual merge of the devicetree tree with the  sound-asoc tree Rob Herring <robherring2@gmail.com> - 2017-06-14 16:00 +0200
    Re: linux-next: manual merge of the devicetree tree with the  sound-asoc tree Mark Brown <broonie@kernel.org> - 2017-06-14 16:40 +0200
    Re: linux-next: manual merge of the devicetree tree with the  sound-asoc tree Sakari Ailus <sakari.ailus@linux.intel.com> - 2017-06-14 23:00 +0200

csiph-web