Messages in this thread | | | From | Grant Likely <> | Date | Mon, 27 Feb 2012 21:38:43 -0700 | Subject | Re: linux-next: manual merge of the devicetree tree with the powerpc tree |
| |
On Mon, Feb 27, 2012 at 7:06 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > Hi Grant, > > Today's linux-next merge of the devicetree tree got a conflict in > arch/powerpc/platforms/iseries/Kconfig between commit 3d066d77cf46 > ("powerpc: remove CONFIG_PPC_ISERIES from the architecture Kconfig > files") from the powerpc tree and commit 0f22dd395fc4 ("of: Only compile > OF_DYNAMIC on PowerPC pseries and iseries") from the devicetree tree. > > The former commit removes the file (as the legacy iSeries platform is > being removed), so I did that.
Okay, thanks.
g.
> -- > Cheers, > Stephen Rothwell sfr@canb.auug.org.au
-- Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd. -- 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/
| |