Hi, On Tue, Dec 27, 2011 at 2:43 PM, Arnd Bergmann <arnd@xxxxxxxx> wrote: > On Wednesday 21 December 2011, Olof Johansson wrote: >> Hi Arnd, >> >> Please pull the following device tree-related updates for tegra for 3.3. Thanks! >> >> >> The following changes since commit 5611cc4572e889b62a7b4c72a413536bf6a9c416: >> >> Linux 3.2-rc4 (2011-12-01 14:56:01 -0800) >> >> are available in the git repository at: >> git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git for-3.3/dt >> > > Pulled into a new next/dt branch, thanks! Thanks! > There is a bogus conflict in arch/arm/mach-tegra/Makefile from merging > two different versions of "arm/tegra: fix variable formatting in makefile". > The patches are identical, but 317d5330 made it into tegra/dt and > 584634e3 into tegra/cleanup. > > Trivial to fix, but something to watch out for in the future. Thanks, I just realized how that must have happened -- I had to rebase to a newer -rc a while back, and must have rebased each branch from scratch instead of rebasing dt on top of the new rebased cleanup. -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
