From: Thierry Reding <thierry.reding@avionic-design•de>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"Bartlomiej Zolnierkiewicz" <b.zolnierkie@samsung•com>,
"Kukjin Kim" <kgene.kim@samsung•com>,
"Kyungmin Park" <kyungmin.park@samsung•com>,
"Sascha Hauer" <s.hauer@pengutronix•de>,
"\"Eric Bénard\"" <eric@eukrea•com>
Subject: Re: linux-next: manual merge of the pwm tree with the s5p tree
Date: Sat, 30 Jun 2012 21:58:47 +0200 [thread overview]
Message-ID: <20120630195847.GA24500@avionic-0098.mockup.avionic-design.de> (raw)
In-Reply-To: <20120629164946.97497f3eb94a5d4fbcc6b448@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1337 bytes --]
On Fri, Jun 29, 2012 at 04:49:46PM +1000, Stephen Rothwell wrote:
> Hi Thierry,
>
> 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?
Thierry
> --
> Cheers,
> Stephen Rothwell sfr@canb•auug.org.au
>
> diff --cc arch/arm/plat-samsung/Makefile
> index 4bb58c2,9685472..0000000
> --- a/arch/arm/plat-samsung/Makefile
> +++ b/arch/arm/plat-samsung/Makefile
> @@@ -59,7 -59,7 +59,3 @@@ obj-$(CONFIG_SAMSUNG_WAKEMASK) += wakeu
>
> obj-$(CONFIG_S5P_PM) += s5p-pm.o s5p-irq-pm.o
> obj-$(CONFIG_S5P_SLEEP) += s5p-sleep.o
> --
> - # PWM support
> -
> - obj-$(CONFIG_HAVE_PWM) += pwm.o
> -# PD support
> -
> -obj-$(CONFIG_SAMSUNG_PD) += pd.o
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2012-06-30 20:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-29 6:49 linux-next: manual merge of the pwm tree with the s5p tree Stephen Rothwell
2012-06-30 19:58 ` Thierry Reding [this message]
2012-07-01 0:27 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2012-06-29 6:58 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120630195847.GA24500@avionic-0098.mockup.avionic-design.de \
--to=thierry.reding@avionic-design$(echo .)de \
--cc=b.zolnierkie@samsung$(echo .)com \
--cc=eric@eukrea$(echo .)com \
--cc=kgene.kim@samsung$(echo .)com \
--cc=kyungmin.park@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=s.hauer@pengutronix$(echo .)de \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox