Re: linux-next: manual merge of the pwm tree with the s5p tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1259 bytes --]

Hi Thierry,

On Sat, 30 Jun 2012 21:58:47 +0200 Thierry Reding <thierry.reding@avionic-design.de> wrote:
>
> On Fri, Jun 29, 2012 at 04:49:46PM +1000, Stephen Rothwell wrote:
> > 
> > Today's linux-next merge of the pwm tree got a conflict in
> > arch/arm/plat-samsung/Makefile between commit 65ab16fd385f ("ARM: EXYNOS:
> > Remove leftovers of the Samsung specific power domain control") from the
> > s5p tree and commit 2663e766c56a ("ARM Samsung: Move s3c pwm driver to
> > pwm framework") from the pwm tree.
> > 
> > Just context changes. I fixed it up (see below) and can carry the fix as
> > necessary.
> 
> I wonder, when these changes are merged by Linus during the merge
> window, does he have to resolve these conflicts again or does he get the
> resolutions from you? Or should I rather base the PWM tree on top of the
> corresponding EXYNOS changes to sidestep the issue?

He will resolve the merge conflicts again but he is good at that.  You do
not need to do anything about these simple conflicts.  Rebasing your tree
would effectively throw away any testing you had done and possibly
introduce more problems into your tree from the other changes.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]