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

From	Lee Jones <lee.jones@linaro.org>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the mfd tree with the arm-soc tree
Date	2015-10-15 10:10 +0200
Message-ID	<qjLLQ-sL-11@gated-at.bofh.it> (permalink)
References	<qjGj8-PB-9@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On Thu, 15 Oct 2015, Stephen Rothwell wrote:

> Hi Lee,
> 
> Today's linux-next merge of the mfd tree got a conflict in:
> 
>   Documentation/devicetree/bindings/mfd/s2mps11.txt
> 
> between commit:
> 
>   6a4479f96543 ("dt-bindings: Document grounded ACOKB pin on S2MPS11")
> 
> from the arm-soc tree and commit:
> 
>   db96ec728d69 ("mfd: dt-bindings: Document pulled down WRSTBI pin on S2MPS1X")
> 
> from the mfd tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Yeah, I thought this might happen.

Hence: http://www.spinics.net/lists/devicetree/msg97548.html.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

Thread

linux-next: manual merge of the mfd tree with the arm-soc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-10-15 04:20 +0200
  Re: linux-next: manual merge of the mfd tree with the arm-soc tree Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2015-10-15 04:30 +0200
  Re: linux-next: manual merge of the mfd tree with the arm-soc tree Lee Jones <lee.jones@linaro.org> - 2015-10-15 10:10 +0200

csiph-web