From: Tomasz Figa <tomasz.figa@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Mike Turquette <mturquette@linaro.org>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org,
Kukjin Kim <kgene.kim@samsung.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>,
Tomasz Figa <t.figa@samsung.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the clk tree with the arm-soc tree
Date: Sun, 26 Jan 2014 22:05:06 +0100 [thread overview]
Message-ID: <52E57882.6060601@gmail.com> (raw)
In-Reply-To: <52E57744.5030807@gmail.com>
On 26.01.2014 21:59, Tomasz Figa wrote:
> Hi Stephen,
>
> On 13.01.2014 06:06, Stephen Rothwell wrote:
>> Hi Mike,
>>
>> Today's linux-next merge of the clk tree got a conflict in
>> drivers/clk/samsung/clk-exynos4.c between commit 86576fbe201b ("clk:
>> samsung: exynos4: Fix definition of div_mmc_pre4 divider") from the
>> arm-soc tree and commit 2d7382375054 ("clk: exynos4: replace clock ID
>> private enums with IDs from DT header") from the clk tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary (no action
>> is required).
>
> It seems like somehow this fix-up has been lost in action and the
> conflict ended up being merged incorrectly in linux-next. Could you take
> a look?
Ehh, it's a false alarm fortunately. I've been looking at wrong ref,
silly me. Sorry for the noise.
Best regards,
Tomasz
WARNING: multiple messages have this Message-ID (diff)
From: tomasz.figa@gmail.com (Tomasz Figa)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the clk tree with the arm-soc tree
Date: Sun, 26 Jan 2014 22:05:06 +0100 [thread overview]
Message-ID: <52E57882.6060601@gmail.com> (raw)
In-Reply-To: <52E57744.5030807@gmail.com>
On 26.01.2014 21:59, Tomasz Figa wrote:
> Hi Stephen,
>
> On 13.01.2014 06:06, Stephen Rothwell wrote:
>> Hi Mike,
>>
>> Today's linux-next merge of the clk tree got a conflict in
>> drivers/clk/samsung/clk-exynos4.c between commit 86576fbe201b ("clk:
>> samsung: exynos4: Fix definition of div_mmc_pre4 divider") from the
>> arm-soc tree and commit 2d7382375054 ("clk: exynos4: replace clock ID
>> private enums with IDs from DT header") from the clk tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary (no action
>> is required).
>
> It seems like somehow this fix-up has been lost in action and the
> conflict ended up being merged incorrectly in linux-next. Could you take
> a look?
Ehh, it's a false alarm fortunately. I've been looking at wrong ref,
silly me. Sorry for the noise.
Best regards,
Tomasz
next prev parent reply other threads:[~2014-01-26 21:05 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-13 5:06 linux-next: manual merge of the clk tree with the arm-soc tree Stephen Rothwell
2014-01-13 5:06 ` Stephen Rothwell
2014-01-13 5:06 ` Stephen Rothwell
2014-01-26 20:59 ` Tomasz Figa
2014-01-26 20:59 ` Tomasz Figa
2014-01-26 21:05 ` Tomasz Figa [this message]
2014-01-26 21:05 ` Tomasz Figa
-- strict thread matches above, loose matches on Subject: below --
2024-07-11 23:58 Stephen Rothwell
2024-07-12 7:00 ` Drew Fustini
2016-11-22 8:41 Stephen Rothwell
2016-11-22 8:41 ` Stephen Rothwell
2016-11-22 9:36 ` Geert Uytterhoeven
2016-11-22 9:36 ` Geert Uytterhoeven
2016-11-22 23:59 ` Stephen Rothwell
2016-11-22 23:59 ` Stephen Rothwell
2016-03-01 3:57 Stephen Rothwell
2016-03-01 3:57 ` Stephen Rothwell
2016-03-01 3:57 ` Stephen Rothwell
2016-03-01 4:00 ` Stephen Rothwell
2016-03-01 4:00 ` Stephen Rothwell
2016-03-01 4:00 ` Stephen Rothwell
2016-03-01 8:38 ` Nicolas Ferre
2016-03-01 8:38 ` Nicolas Ferre
2016-03-01 8:38 ` Nicolas Ferre
2015-02-03 5:31 Stephen Rothwell
2015-02-03 5:31 ` Stephen Rothwell
2015-02-03 5:31 ` Stephen Rothwell
2015-02-03 18:25 ` Mike Turquette
2015-02-03 18:25 ` Mike Turquette
2015-02-03 5:28 Stephen Rothwell
2015-02-03 5:28 ` Stephen Rothwell
2015-02-03 5:28 ` Stephen Rothwell
2013-06-17 7:27 Stephen Rothwell
2013-06-17 7:27 ` Stephen Rothwell
2013-06-17 7:27 ` Stephen Rothwell
2013-06-17 18:49 ` Mike Turquette
2013-06-17 18:49 ` Mike Turquette
2013-04-19 7:27 Stephen Rothwell
2013-04-19 7:27 ` Stephen Rothwell
2013-04-19 7:27 ` Stephen Rothwell
2013-04-19 9:47 ` Pawel Moll
2013-04-19 9:47 ` Pawel Moll
2013-02-02 12:27 Stephen Rothwell
2013-02-02 12:27 ` Stephen Rothwell
2013-02-02 12:27 ` Stephen Rothwell
2013-02-04 17:54 ` Mike Turquette
2013-02-04 17:54 ` Mike Turquette
2012-11-28 6:12 Stephen Rothwell
2012-11-28 6:12 ` Stephen Rothwell
2012-11-28 6:12 ` Stephen Rothwell
2012-10-30 4:06 Stephen Rothwell
2012-10-30 4:06 ` Stephen Rothwell
2012-10-30 4:06 ` Stephen Rothwell
2012-10-30 10:11 ` Mike Turquette
2012-10-30 10:11 ` Mike Turquette
2012-10-30 10:39 ` Pawel Moll
2012-10-30 10:39 ` Pawel Moll
2012-09-10 6:14 Stephen Rothwell
2012-09-10 6:14 ` Stephen Rothwell
2012-09-10 6:14 ` Stephen Rothwell
2012-09-10 15:24 ` Linus Walleij
2012-09-10 15:24 ` Linus Walleij
2012-09-10 16:51 ` Mike Turquette
2012-09-10 16:51 ` Mike Turquette
2012-07-13 5:14 Stephen Rothwell
2012-07-13 5:14 ` Stephen Rothwell
2012-07-13 5:14 ` Stephen Rothwell
2012-07-13 15:10 ` Rob Herring
2012-07-13 15:10 ` Rob Herring
2012-07-13 17:27 ` Mike Turquette
2012-07-13 17:27 ` Mike Turquette
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=52E57882.6060601@gmail.com \
--to=tomasz.figa@gmail.com \
--cc=a.hajda@samsung.com \
--cc=arnd@arndb.de \
--cc=kgene.kim@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mturquette@linaro.org \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
--cc=t.figa@samsung.com \
/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.