Russell King - ARM Linux wrote:
>
> On Tue, Dec 27, 2011 at 04:31:52PM +0900, Kukjin Kim wrote:
> > Kukjin Kim wrote:
> > >
> > > Russell King - ARM Linux wrote:
> > > >
> >
> > > > It looks like there's some changes made to exynos stuff between -rc1
> > >
> > > Yes, some bug has been fixed after -rc1...
> > >
> >
> > Hi Russell,
> >
> > It is not a bug fix after -rc1 in mainline and the changes are from
> Marc's
> > commit db0d4db2 ("ARM: gic: allow GIC to support non-banked setups") and
> > Axel's bug fixes on Marc's patch which are in your devel-stable branch.
> >
> > If this patch is not on top of Marc's patch, you can meet conflicts when
> you
> > merge the reset branch. Nevertheless, I'm sending the cleaned
> patch(7257/1
> > and 7258/1) which can be applied based on your restart-cleanup so that
> you
> > can apply this easily anyway and in addition, you can apply other
> > patches(7254/1, 7255/1 and 7256/1) as well.
> >
> > I think, expected conflicts when you merge your branches can be fixed
> and if
> > any problems, please let me know.
> >
> > As a note, since local common.[ch] which are not based on current
> samsung
> > tree have been introduced, we will meet conflicts between this series
> and my
> > tree and of course, I will fix then.
>
> Right, so this is _still_ giving me problems. 7257/1 now applies. 7258/1
> combines my patch "ARM: restart: exynos4: use new restart hook XXX WIP XXX
> WHY IS THERE NO LOCAL HEADERS IN arch/arm/mach-exynos4 XXX" with an update
> from you for the new common.h header, and my "ARM: restart: plat-samsung:
> remove plat/reset.h and s5p_reset_hook" patch.
>
> This is wrong - s5p_reset_hook is used by other Samsung platforms as well,
Hmm..I thought the s5p_reset_hook() is not used more on other S5P SoCs,
because it has been already cleaned up for S5P64X0, S5PC100 and S5PV210.
Anyway, either way ok to me :)
> and its removal can only happen after _all_ the other platforms have been
> converted. If I place your exynos patchs before the other Samsung patches
> (I'm keeping the platforms in alphabetical order) then things will break.
>
> Please regenerate 7258/1 without my "ARM: restart: plat-samsung:
> remove plat/reset.h and s5p_reset_hook" patch combined.
>
OK, let me do it soon.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@xxxxxxxxxxx>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
