[lkml]   [2014]   [Feb]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the staging tree with the arm-soc tree
On Tue, Feb 25, 2014 at 08:51:37AM -0800, Olof Johansson wrote:
> On Tue, Feb 25, 2014 at 8:49 AM, Greg KH <> wrote:
> > On Tue, Feb 25, 2014 at 05:09:44PM +1100, Stephen Rothwell wrote:
> >> Hi Greg,
> >>
> >> Today's linux-next merge of the staging tree got a conflict in
> >> arch/arm/boot/dts/imx53-qsb.dts between commit d5eb195f26fa ("ARM: dts:
> >> i.MX53: move common QSB nodes to new file") from the arm-soc tree and
> >> commit 17b5001b5143 ("imx-drm: convert to componentised device support")
> >> from the staging tree.
> >>
> >> I fixed it up (see at bottom) and can carry the fix as necessary (no
> >> action is required). I also added the following fix up patch:
> >
> > I think it's right, but I really have no idea about any of these. I'll
> > defer to Russell to ensure they are correct.
> We normally merge all dts changes through arm-soc to avoid these kind
> of conflicts. Since your tree is a stable one there isn't much to do
> about it, but I'd appreciate it if we just got those parts of the
> patch series in the future to avoid these situations. We've been bit
> by it before.

I can revert these patches, but for some reason Russell said they should
go through this one, so I took them...

Russell, thoughts?

 \ /
  Last update: 2014-02-25 18:41    [W:0.060 / U:5.952 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site