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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAL_Jsq+h8Bx9Ks8K8f6G7JJcouqChUEX40T4xosBdk+1GJiQiQ@mail.gmail.com>
Date:   Wed, 14 Jun 2017 08:55:37 -0500
From:   Rob Herring <robherring2@...il.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Sakari Ailus <sakari.ailus@...ux.intel.com>
Cc:     Mark Brown <broonie@...nel.org>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Kuninori Morimoto <kuninori.morimoto.gx@...esas.com>
Subject: Re: linux-next: manual merge of the devicetree tree with the
 sound-asoc tree

On Tue, Jun 13, 2017 at 9:54 PM, Stephen Rothwell <sfr@...b.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