Messages in this thread | | | From | Kukjin Kim <> | Subject | RE: linux-next: manual merge of the arm-current tree with Linus' tree | Date | Fri, 13 Jan 2012 09:59:49 +0900 |
| |
Stephen Rothwell wrote: > > Hi Russell, > > Today's linux-next merge of the arm-current tree got a conflict in > arch/arm/mach-exynos/common.c between (I think) commit 237c78beb8a9 > ("Merge branch 'depends/rmk/for-linus' into samsung/dt") from Linus' tree > and commit 588ac27d3419 ("ARM: 7273/1: EXYNOS: Fix build error which was > from common.c and old cpu.c") from the arm-current tree. > > So this arm-current fi is superceded by the merge above that is now in > Linus' tree. > Oh, right. Now we don't need the commit 588ac27d3419.
Russell, could you please remove it in your tree?
> I fixed it up by ignoring the arm-current version.
Thanks.
Best regards, Kgene. -- Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
| |