From: Kukjin Kim <kgene.kim@samsung•com>
To: 'Stephen Rothwell' <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
'Amit Daniel Kachhap' <amit.daniel@samsung•com>,
'Tomasz Figa' <t.figa@samsung•com>,
'Linus Walleij' <linus.walleij@linaro•org>
Subject: RE: linux-next: manual merge of the samsung tree with the pinctrl tree
Date: Wed, 07 Nov 2012 11:26:36 +0900 [thread overview]
Message-ID: <0c4401cdbc8f$4ff0f8b0$efd2ea10$%kim@samsung.com> (raw)
In-Reply-To: <20121030144412.4a4a60dc0dace86f1a91af8c@canb.auug.org.au>
Stephen Rothwell wrote:
>
> Hi Kukjin,
>
Hi,
> Today's linux-next merge of the samsung tree got a conflict in
> arch/arm/boot/dts/exynos4210.dtsi between commit a7a8241540c3 ("ARM: dts:
> exynos4210-pinctrl: Add nodes for pin banks") from the pinctrl tree and
> commit 8d4155dbb184 ("ARM: EXYNOS: Add devicetree node for TMU driver for
> exynos4") from the samsung tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
Correct, thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung•com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
prev parent reply other threads:[~2012-11-07 2:26 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-30 3:44 linux-next: manual merge of the samsung tree with the pinctrl tree Stephen Rothwell
2012-11-07 2:26 ` Kukjin Kim [this message]
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='0c4401cdbc8f$4ff0f8b0$efd2ea10$%kim@samsung.com' \
--to=kgene.kim@samsung$(echo .)com \
--cc=amit.daniel@samsung$(echo .)com \
--cc=linus.walleij@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=t.figa@samsung$(echo .)com \
/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