[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-next
Subject:    Re: linux-next: manual merge of the devicetree tree with the pm, mfd and regulator trees
From:       Lee Jones <lee.jones () linaro ! org>
Date:       2014-11-27 8:49:02
Message-ID: 20141127084902.GC4628 () x1
[Download RAW message or body]

> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]