From: Kukjin Kim <kgene.kim@samsung.com>
To: Olof Johansson <olof@lixom.net>
Cc: Kukjin Kim <kgene.kim@samsung.com>, Arnd Bergmann <arnd@arndb.de>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"linux-samsung-soc@vger.kernel.org"
<linux-samsung-soc@vger.kernel.org>,
MyungJoo Ham <myungjoo.ham@samsung.com>
Subject: Re: [GIT PULL] Samsung Cleanup EXYNOS clock for v3.4
Date: Sun, 11 Mar 2012 00:00:39 -0800 [thread overview]
Message-ID: <4F5C5BA7.8050904@samsung.com> (raw)
In-Reply-To: <20120310173526.GB5972@quad.lixom.net>
On 03/10/12 09:35, Olof Johansson wrote:
[...]
>
> The contents of the branch itself looks good, but now you have introduced
> a modified/delete conflict with yourself.
>
> You modify arch/arm/mach-exynos/clock.c in your cleanup-use-static branch, and
> then you move it here. That means that when I merge in this branch, git throws
> a conflict and I have to do manual edits to make the contents match.
>
> It's better if you base this branch on your cleanup-use-static branch, so that
> the move includes those edits. That way there is no conflict resolution to do
> at our end either.
>
> Can you please do that rebase and send a fresh pull request? I'll continue
> looking at your other requests meanwhile.
>
Hi Olof,
Sorry for late response. OK I see and your suggestion sounds good to me.
Let me send a new pull request after that.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
WARNING: multiple messages have this Message-ID (diff)
From: kgene.kim@samsung.com (Kukjin Kim)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] Samsung Cleanup EXYNOS clock for v3.4
Date: Sun, 11 Mar 2012 00:00:39 -0800 [thread overview]
Message-ID: <4F5C5BA7.8050904@samsung.com> (raw)
In-Reply-To: <20120310173526.GB5972@quad.lixom.net>
On 03/10/12 09:35, Olof Johansson wrote:
[...]
>
> The contents of the branch itself looks good, but now you have introduced
> a modified/delete conflict with yourself.
>
> You modify arch/arm/mach-exynos/clock.c in your cleanup-use-static branch, and
> then you move it here. That means that when I merge in this branch, git throws
> a conflict and I have to do manual edits to make the contents match.
>
> It's better if you base this branch on your cleanup-use-static branch, so that
> the move includes those edits. That way there is no conflict resolution to do
> at our end either.
>
> Can you please do that rebase and send a fresh pull request? I'll continue
> looking at your other requests meanwhile.
>
Hi Olof,
Sorry for late response. OK I see and your suggestion sounds good to me.
Let me send a new pull request after that.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
next prev parent reply other threads:[~2012-03-11 8:00 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-08 11:13 [GIT PULL] Samsung Cleanup EXYNOS clock for v3.4 Kukjin Kim
2012-03-08 11:13 ` Kukjin Kim
2012-03-08 15:16 ` Olof Johansson
2012-03-08 15:16 ` Olof Johansson
2012-03-09 15:33 ` Kukjin Kim
2012-03-09 15:33 ` Kukjin Kim
2012-03-10 15:35 ` Kukjin Kim
2012-03-10 15:35 ` Kukjin Kim
2012-03-10 17:35 ` Olof Johansson
2012-03-10 17:35 ` Olof Johansson
2012-03-11 8:00 ` Kukjin Kim [this message]
2012-03-11 8:00 ` Kukjin Kim
-- strict thread matches above, loose matches on Subject: below --
2012-03-09 4:38 함명주
2012-03-09 7:06 ` MyungJoo Ham
2012-03-09 7:06 ` MyungJoo Ham
2012-03-09 15:33 ` Kukjin Kim
2012-03-09 15:33 ` Kukjin Kim
2012-03-10 10:37 ` Kukjin Kim
2012-03-10 10:37 ` Kukjin Kim
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=4F5C5BA7.8050904@samsung.com \
--to=kgene.kim@samsung.com \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=myungjoo.ham@samsung.com \
--cc=olof@lixom.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.