Hi,
Quoting Mark Brown (2013-12-31 08:09:16)
quoted
On Mon, Dec 30, 2013 at 09:33:50AM +0530, Tushar Behera wrote:
quoted
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.
Did you merged these patches into clk-next? Unfortunately I couldn't
find them (clk-next, next).
I am asking because I want to send patches with support for S2MPS14
clock (based on these patches).
Best regards,
Krzysztof