Messages in this thread | | | Date | Thu, 27 Nov 2014 08:49:02 +0000 | From | Lee Jones <> | Subject | Re: linux-next: manual merge of the devicetree tree with the pm, mfd and regulator trees |
| |
> Today's linux-next merge of the devicetree tree got a conflict in > include/linux/of.h between commits b31384fa5de3 ("Driver core: Unified > device properties interface for platform firmware") from the pm tree > and a4b4e0461ec5 ("of: Add standard property for poweroff capability") > from the mfd and regulator trees and commit 7518b5890d8a ("of/overlay: > Introduce DT overlay support") from the devicetree tree.
This patch actually originated from the Regulator tree. I pulled it in to avoid conflicts between MFD and Regulator. I guess OF needs to do the same to avoid a conflict when Linus pulls them in.
[...]
-- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
| |