On Mon, Nov 04, 2013 at 08:15:50AM -0600, Rob Herring wrote:
> On 11/04/2013 07:17 AM, Shawn Guo wrote:
> > On Mon, Nov 04, 2013 at 03:27:39PM +1100, Stephen Rothwell wrote:
> >> Hi Rob,
> >>
> >> Today's linux-next merge of the dt-rh tree got a conflict in
> >> Documentation/devicetree/bindings/vendor-prefixes.txt between commit
> >> 064d7f6c985a ("ARM: dts: Add vendor prefix for Voipac Technologies
> >> s.r.o") from the imx-mxs tree and commit d6c3073e7fb5 ("DT: sort
> >> vendor-prefixes.txt") from the dt-rh tree.
> >
> > Hi Rob,
> >
> > Would you like to apply the patch "ARM: dts: Add vendor prefix for
> > Voipac Technologies s.r.o" on your tree, so that we can save this
> > conflict? If so, I will drop the patch from my tree. Just let me know.
>
> Unless it is the top commit, it is best to not rebase your tree.
I'm queuing the patch for 3.14, and my branch will be rebased to
3.13-rc anyway.
Are you queuing "DT: sort vendor-prefixes.txt" for 3.13 or 3.14? If
it's for 3.13, we will be fine, since the conflict will be solved on my
side when my branch gets rebased to 3.13-rc.
Shawn
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
