From: Mike Turquette <mturquette@linaro.org>
To: Mark Brown <broonie@kernel.org>,
Tushar Behera <tushar.behera@linaro.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
linux-samsung-soc <linux-samsung-soc@vger.kernel.org>,
Lee Jones <lee.jones@linaro.org>,
Kgene Kim <kgene.kim@samsung.com>,
Patch Tracking <patches@linaro.org>
Subject: Re: [PATCH RESEND 1/4] clk: clk-s2mps11: Refactor for including support for other MFD clocks
Date: Tue, 31 Dec 2013 11:13:42 -0800 [thread overview]
Message-ID: <20131231191342.12054.42268@quantum> (raw)
In-Reply-To: <20131231160916.GG31886@sirena.org.uk>
Quoting Mark Brown (2013-12-31 08:09:16)
> On Mon, Dec 30, 2013 at 09:33:50AM +0530, Tushar Behera wrote:
>
> > Commit 1b1ccee1e821 "mfd: s2mps11: Fix build after regmap field rename
> > in sec-core.c" is also touching this file, which is in Mark's tree
> > right now. If I rebase
>
> It's been in Linus' tree for a while now.
OK, so I merged the two patches into clk-next, then merged clk-next into
next-20131224 and the merge is super trivial to resolve. So I propose
that we just let it get resolved in linux-next the usual way.
Any objections? If not I'll take these two patches into clk-next.
Regards,
Mike
WARNING: multiple messages have this Message-ID (diff)
From: mturquette@linaro.org (Mike Turquette)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH RESEND 1/4] clk: clk-s2mps11: Refactor for including support for other MFD clocks
Date: Tue, 31 Dec 2013 11:13:42 -0800 [thread overview]
Message-ID: <20131231191342.12054.42268@quantum> (raw)
In-Reply-To: <20131231160916.GG31886@sirena.org.uk>
Quoting Mark Brown (2013-12-31 08:09:16)
> On Mon, Dec 30, 2013 at 09:33:50AM +0530, Tushar Behera wrote:
>
> > Commit 1b1ccee1e821 "mfd: s2mps11: Fix build after regmap field rename
> > in sec-core.c" is also touching this file, which is in Mark's tree
> > right now. If I rebase
>
> It's been in Linus' tree for a while now.
OK, so I merged the two patches into clk-next, then merged clk-next into
next-20131224 and the merge is super trivial to resolve. So I propose
that we just let it get resolved in linux-next the usual way.
Any objections? If not I'll take these two patches into clk-next.
Regards,
Mike
next prev parent reply other threads:[~2013-12-31 19:13 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-31 6:48 [PATCH 0/4] Add support for clocks in S5M8767 Tushar Behera
2013-10-31 6:48 ` Tushar Behera
2013-10-31 6:48 ` [PATCH 1/4] clk: clk-s2mps11: Refactor for including support for other MFD clocks Tushar Behera
2013-10-31 6:48 ` Tushar Behera
2013-11-11 14:17 ` Yadwinder Singh Brar
2013-11-11 14:17 ` Yadwinder Singh Brar
2013-10-31 6:48 ` [PATCH 2/4] clk: clk-s2mps11: Add support for clocks in S5M8767 MFD Tushar Behera
2013-10-31 6:48 ` Tushar Behera
2013-11-11 14:18 ` Yadwinder Singh Brar
2013-11-11 14:18 ` Yadwinder Singh Brar
2013-10-31 6:48 ` [PATCH 3/4] mfd: sec-core: Add cells for S5M8767-clocks Tushar Behera
2013-10-31 6:48 ` Tushar Behera
2013-10-31 16:16 ` Lee Jones
2013-10-31 16:16 ` Lee Jones
2013-11-05 6:29 ` Tushar Behera
2013-11-05 6:29 ` Tushar Behera
2013-11-05 7:57 ` Kyungmin Park
2013-11-05 7:57 ` Kyungmin Park
2013-11-05 8:04 ` Tushar Behera
2013-11-05 8:04 ` Tushar Behera
2013-11-05 8:58 ` Kyungmin Park
2013-11-05 8:58 ` Kyungmin Park
2013-10-31 6:48 ` [PATCH 4/4] ARM: dts: Add S5M8767 clock nodes on Arndale board Tushar Behera
2013-10-31 6:48 ` Tushar Behera
2013-11-10 12:34 ` [PATCH 0/4] Add support for clocks in S5M8767 Tomasz Figa
2013-11-10 12:34 ` Tomasz Figa
2013-11-11 2:58 ` Tushar Behera
2013-11-11 2:58 ` Tushar Behera
2013-12-24 8:57 ` Tushar Behera
2013-12-24 8:57 ` Tushar Behera
2013-12-24 8:57 ` Tushar Behera
2013-12-26 10:18 ` [PATCH RESEND " Tushar Behera
2013-12-26 10:18 ` Tushar Behera
2013-12-26 10:18 ` [PATCH RESEND 1/4] clk: clk-s2mps11: Refactor for including support for other MFD clocks Tushar Behera
2013-12-26 10:18 ` Tushar Behera
2013-12-26 10:18 ` Tushar Behera
2013-12-29 22:17 ` Mike Turquette
2013-12-29 22:17 ` Mike Turquette
2013-12-29 22:17 ` Mike Turquette
2013-12-30 4:03 ` Tushar Behera
2013-12-30 4:03 ` Tushar Behera
2013-12-31 16:09 ` Mark Brown
2013-12-31 16:09 ` Mark Brown
2013-12-31 19:13 ` Mike Turquette [this message]
2013-12-31 19:13 ` Mike Turquette
2013-12-26 10:18 ` [PATCH RESEND 2/4] clk: clk-s2mps11: Add support for clocks in S5M8767 MFD Tushar Behera
2013-12-26 10:18 ` Tushar Behera
2013-12-26 10:19 ` [PATCH RESEND 3/4] mfd: sec-core: Add cells for S5M8767-clocks Tushar Behera
2013-12-26 10:19 ` Tushar Behera
2014-01-06 11:22 ` Lee Jones
2014-01-06 11:22 ` Lee Jones
2013-12-26 10:19 ` [PATCH RESEND 4/4] ARM: dts: Add S5M8767 clock nodes on Arndale board Tushar Behera
2013-12-26 10:19 ` Tushar Behera
[not found] <m8Uox-5kN-11@gated-at.bofh.it>
[not found] ` <mtgmt-44E-3@gated-at.bofh.it>
[not found] ` <mtgmu-44E-27@gated-at.bofh.it>
[not found] ` <muwSe-WJ-17@gated-at.bofh.it>
[not found] ` <muCkW-RP-15@gated-at.bofh.it>
[not found] ` <mva3f-bR-7@gated-at.bofh.it>
[not found] ` <mvd17-4vW-3@gated-at.bofh.it>
2014-01-29 10:29 ` [PATCH RESEND 1/4] clk: clk-s2mps11: Refactor for including support for other MFD clocks Krzysztof Kozlowski
2014-01-29 10:29 ` Krzysztof Kozlowski
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=20131231191342.12054.42268@quantum \
--to=mturquette@linaro.org \
--cc=broonie@kernel.org \
--cc=kgene.kim@samsung.com \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=patches@linaro.org \
--cc=tushar.behera@linaro.org \
/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.