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

[Lee Jones]

On Tue, 22 Mar 2022, Stephen Rothwell wrote:

> Hi all,
> 
> Today's linux-next merge of the devicetree tree got a conflict in:
> 
>   Documentation/devicetree/bindings/mfd/syscon.yaml
> 
> between commit:
> 
>   844dd8fe02f2 ("dt-bindings: Add compatibles for undocumented trivial syscons")
> 
> from the mfd tree and commit:
> 
>   c1ff0c0f24d6 ("dt-bindings: mfd: syscon: add microchip,lan966x-cpu-syscon compatible")
> 
> from the devicetree tree.

Did you accidentally hoover this up Rob?

-- 
Lee Jones [李琼斯]
Principal Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog