Hello Scott, On 01/29/2015 11:03 PM, Scott Wood wrote: > On Mon, Dec 08, 2014 at 04:29:20AM -0600, Emil Medve wrote: >> From: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx> >> >> Change-Id: If643fa5ba0a903aef8f5056a2c90ebecc995b760 >> Signed-off-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx> >> Signed-off-by: Geoff Thorpe <Geoff.Thorpe@xxxxxxxxxxxxx> >> Signed-off-by: Hai-Ying Wang <Haiying.Wang@xxxxxxxxxxxxx> >> Signed-off-by: Chunhe Lan <Chunhe.Lan@xxxxxxxxxxxxx> >> Signed-off-by: Poonam Aggrwal <poonam.aggrwal@xxxxxxxxxxxxx> >> [Emil Medve: Sync with the upstream binding] >> Signed-off-by: Emil Medve <Emilian.Medve@xxxxxxxxxxxxx> > > Doesn't apply cleanly > >> @@ -408,6 +415,8 @@ crypto: crypto@300000 { >> fsl,iommu-parent = <&pamu1>; >> }; >> >> +/include/ "qoriq-bman1.dtsi" >> + >> /include/ "qoriq-fman-0.dtsi" >> /include/ "qoriq-fman-0-1g-0.dtsi" >> /include/ "qoriq-fman-0-1g-1.dtsi" > > What tree did you base these patches on? There's no fman in the upstream > device trees yet (just a binding). They were based on this patch series: http://patchwork.ozlabs.org/patch/370866. Will re-send Cheers, -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html