On Tue, Sep 19, 2017 at 9:26 PM, Stephen Rothwell <s...@canb.auug.org.au> wrote:
> Hi Rob,
>
> Today's linux-next merge of the devicetree tree got a conflict in:
>
> Documentation/devicetree/bindings/vendor-prefixes.txt
>
> between commit:
>
> 50544f39018f ("dt-bindings: Add vendor prefix for Amarula Solutions")
>
> from the rockchip tree, commit:
>
> 912620c02c31 ("dt-bindings: add vendor prefix for Touchless Biometric
> Systems AG")
>
> from the sunxi tree and commit:
>
> e6262a54124d ("dt-bindings: vendor-prefixes: align indentation of company
> names`")
> (this is going to be fun :-()
I've dropped it. Was going to send for rc2, but I guess that's not
going to be early enough. I'll plan to do it just before rc1 next
cycle (or get distracted and forget about it).
Rob
