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

2014-12-03 Thread Grant Likely
On Wed, Dec 3, 2014 at 7:02 AM, Romain Perier wrote: > Hi, > > My part looks good and unchanged (first commit), however I would > prefer a confirmation from Grant about the full merge. > > Thanks, > Romain Looks okay to me. g. > > 2014-12-03 5:27 GMT+01:00 Stephen Rothwell : >> Hi Grant, >> >>

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

2014-12-02 Thread Romain Perier
Hi, My part looks good and unchanged (first commit), however I would prefer a confirmation from Grant about the full merge. Thanks, Romain 2014-12-03 5:27 GMT+01:00 Stephen Rothwell : > Hi Grant, > > Today's linux-next merge of the devicetree tree got a conflict in > include/linux/of.h between c

linux-next: manual merge of the devicetree tree with the regulator tree

2014-12-02 Thread Stephen Rothwell
Hi Grant, Today's linux-next merge of the devicetree tree got a conflict in include/linux/of.h between commit 8f73110f6bac ("of: Rename "poweroff-source" property to "system-power-controller"") from the pm tree and commit 7518b5890d8a ("of/overlay: Introduce DT overlay support") from the devicetre