From: Kukjin Kim <kgene-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
To: 'Tomasz Figa'
<tomasz.figa-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
'Mike Turquette'
<mturquette-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Cc: "'Tomasz Figa'" <t.figa-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
"'Mark Brown'" <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
"'Arnd Bergmann'" <arnd-r2nGTMty4D4@public.gmane.org>,
"'Olof Johansson'" <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>,
stern-nwvwT67g6+6dFdvTe/nMLpVzexx5G7lz@public.gmane.org,
gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org,
linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
"'Sylwester Nawrocki'"
<sylvester.nawrocki-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
"'Heiko Stübner'" <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>,
"'Thomas Abraham'"
<thomas.abraham-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Subject: RE: [PATCH v2 0/8] Common Clock Framework support for Samsung S3C64xx
Date: Sat, 17 Aug 2013 19:30:11 +0900 [thread overview]
Message-ID: <158901ce9b34$c0ac8720$42059560$@org> (raw)
In-Reply-To: <3890424.fJfWX17mED@flatron>
Tomasz Figa wrote:
[...]
> > > > >
> > > > > Basically, this series looks good to me, but I'm not sure how this
> > > > > should be handled because of dependency with PWM cleanup and clk
> > > > > stuff
> > > > > in clk tree now...
> > > >
> > > > Patches 1-3 can go into the clk tree. 4-6 should go through their
> > > > respective trees.
> > >
> > > It looks like version 2 of patch 2/8 has been applied by mistake,
> > > breaking compilation (and operation) of the clock driver added in
> > > patch 3/8.
> > Ugh. My mistake.
>
> Happens. Thanks for fast response.
>
Sorry for late ;-)
> > > Could you please fix this up? Thanks in advance.
> >
> > This is a little tricky since I published the clk-next-s3c64xx branch as
> > a stable branch for Samsung which I think has been merged to the
> > Samsung tree already.
>
> Right, this somewhat limits our options. Although I'm not really sure
> whether Kukjin already has pushed it to his public tree.
>
Yeah, I already did sort out in my local but not public tree because of some
problem.
> > So what are the options?
> >
> > One option is to create a fixup patch that just manages the delta
> > between V2 and V3. I can then add this to the top of clk-next-s3c64xx
> > and re-merge it into clk-next. Then the Samsung tree will need to
> > re-merge that dependency branch.
>
> Well, I can make a "convert PLL65xx to new registration method" patch,
> that would be basically the delta. If this could be merged before patch
> 7/8, no regression would be introduced.
>
> > Do you have a better idea?
>
> Not really. Maybe let's ask Kukjin whether he has already merged it to his
> tree. Kukjin, have you?
>
OK, if new branch is ready, I will replace with that or if re-merge is
required, I will. Either way, I'm fine and can handle. Mike, let me know
your choice :-)
Thanks,
Kukjin
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2013-08-17 10:30 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-22 23:49 [PATCH v2 0/8] Common Clock Framework support for Samsung S3C64xx Tomasz Figa
2013-07-22 23:49 ` [PATCH v2 1/8] clk: mux: Add support for read-only muxes Tomasz Figa
[not found] ` <1374536965-3545-2-git-send-email-tomasz.figa-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-07-23 11:22 ` Sergei Shtylyov
2013-07-23 11:25 ` Tomasz Figa
2013-07-27 12:41 ` Tomasz Figa
2013-08-02 21:46 ` Mike Turquette
2013-07-22 23:49 ` [PATCH v2 4/8] ARM: SAMSUNG: Add soc_is_s3c6400/s3c6410 macros Tomasz Figa
2013-07-22 23:49 ` [PATCH v2 5/8] ARM: s3c64xx: dma: Use clk_prepare_enable/clk_disable_unprepare Tomasz Figa
2013-07-28 12:32 ` Mark Brown
[not found] ` <1374536965-3545-1-git-send-email-tomasz.figa-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-07-22 23:49 ` [PATCH v2 2/8] clk: samsung: pll: Add support for PLL6552 and PLL6553 Tomasz Figa
2013-07-23 23:52 ` [PATCH v3 " Tomasz Figa
2013-07-28 12:30 ` Mark Brown
2013-07-28 12:38 ` Tomasz Figa
2013-08-02 22:53 ` Mike Turquette
2013-07-22 23:49 ` [PATCH v2 3/8] clk: samsung: Add clock driver for S3C64xx SoCs Tomasz Figa
2013-07-23 23:55 ` [PATCH v3 " Tomasz Figa
2013-07-22 23:49 ` [PATCH v2 6/8] usb: host: ohci-s3c2410 Use clk_prepare_enable/clk_disable_unprepare Tomasz Figa
2013-07-23 0:15 ` Fabio Estevam
[not found] ` <CAOMZO5D4X+GT+LdUOjorJ8xgBCwv9iAP4W-RzKrbnE-93kxmUg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-07-23 0:44 ` Tomasz Figa
[not found] ` <1374536965-3545-7-git-send-email-tomasz.figa-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2013-07-31 18:58 ` Tomasz Figa
2013-07-31 20:44 ` Alan Stern
[not found] ` <Pine.LNX.4.44L0.1307311643110.1546-100000-IYeN2dnnYyZXsRXLowluHWD2FQJk+8+b@public.gmane.org>
2013-08-01 7:45 ` Greg KH
2013-07-22 23:49 ` [PATCH v2 7/8] ARM: s3c64xx: Migrate clock handling to Common Clock Framework Tomasz Figa
2013-08-05 17:01 ` [PATCH v2 0/8] Common Clock Framework support for Samsung S3C64xx Kukjin Kim
[not found] ` <51FFDA70.7080900-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
2013-08-05 18:06 ` Mike Turquette
2013-08-05 18:13 ` Kukjin Kim
2013-08-05 19:02 ` Mike Turquette
2013-08-05 23:42 ` Tomasz Figa
2013-08-06 19:47 ` Mike Turquette
2013-08-06 22:06 ` Tomasz Figa
2013-08-06 22:11 ` Kukjin Kim
2013-08-06 22:13 ` Tomasz Figa
2013-08-16 10:44 ` Tomasz Figa
2013-08-16 21:02 ` Mike Turquette
2013-08-16 21:15 ` Tomasz Figa
2013-08-17 10:30 ` Kukjin Kim [this message]
2013-08-20 0:22 ` Mike Turquette
2013-08-20 7:09 ` Kukjin Kim
2013-08-25 17:19 ` Kukjin Kim
2013-08-21 0:33 ` [PATCH] clk: samsung: pll: Use new registration method for PLL6552 and PLL6553 Tomasz Figa
2013-08-27 1:14 ` Mike Turquette
2013-08-27 17:16 ` Kukjin Kim
2013-08-27 23:45 ` Mike Turquette
2013-07-22 23:49 ` [PATCH v2 8/8] ARM: s3c64xx: Remove old clock management code Tomasz Figa
2013-07-24 12:20 ` [PATCH v2 0/8] Common Clock Framework support for Samsung S3C64xx 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='158901ce9b34$c0ac8720$42059560$@org' \
--to=kgene-dgejt+ai2ygdnm+yrofe0a@public.gmane.org \
--cc=arnd-r2nGTMty4D4@public.gmane.org \
--cc=broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org \
--cc=heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=mturquette-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
--cc=olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org \
--cc=stern-nwvwT67g6+6dFdvTe/nMLpVzexx5G7lz@public.gmane.org \
--cc=sylvester.nawrocki-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=t.figa-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org \
--cc=thomas.abraham-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
--cc=tomasz.figa-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox