From: Mike Turquette <mturquette@ti.com>
To: Rob Herring <robherring2@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Linus Walleij <linus.walleij@linaro.org>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org
Subject: Re: linux-next: manual merge of the clk tree with the arm-soc tree
Date: Fri, 13 Jul 2012 10:27:04 -0700 [thread overview]
Message-ID: <20120713172704.GO2772@gmail.com> (raw)
In-Reply-To: <50003A6F.5090008@gmail.com>
On 20120713-10:10, Rob Herring wrote:
>
>
> On 07/13/2012 12:14 AM, Stephen Rothwell wrote:
> > Hi Mike,
> >
> > Today's linux-next merge of the clk tree got a conflict in
> > drivers/clk/Makefile between commit 4a31bd28e86a ("ARM: nomadik: convert
> > to generic clock") from the arm-soc tree and commit 8d4d9f52081c ("clk:
> > add highbank clock support") from the clk tree.
> >
> > Just context changes. I fixed it up (see below) and can carry the fix as
> > necessary.
> >
> > --
> > Cheers,
> > Stephen Rothwell sfr@canb.auug.org.au
> >
> > diff --cc drivers/clk/Makefile
> > index 26b6b92,02ffdf6..0000000
> > --- a/drivers/clk/Makefile
> > +++ b/drivers/clk/Makefile
> > @@@ -3,6 -3,11 +3,12 @@@ obj-$(CONFIG_CLKDEV_LOOKUP) += clkdev.
> > obj-$(CONFIG_COMMON_CLK) += clk.o clk-fixed-rate.o clk-gate.o \
> > clk-mux.o clk-divider.o clk-fixed-factor.o
> > # SoCs specific
> > +obj-$(CONFIG_ARCH_NOMADIK) += clk-nomadik.o
> > + obj-$(CONFIG_ARCH_HIGHBANK) += clk-highbank.o
> > obj-$(CONFIG_ARCH_MXS) += mxs/
> > obj-$(CONFIG_PLAT_SPEAR) += spear/
> > + obj-$(CONFIG_ARCH_U300) += clk-u300.o
> > + obj-$(CONFIG_ARCH_INTEGRATOR) += versatile/
>
> These should be sorted.
>
Hi Rob,
Did something change in the arm-soc tree to resolve this conflict?
Nothing changed in clk-next.
Thanks,
Mike
> Rob
>
> > +
> > + # Chip specific
> > + obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o
next prev parent reply other threads:[~2012-07-13 17:27 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-13 5:14 linux-next: manual merge of the clk tree with the arm-soc tree Stephen Rothwell
2012-07-13 15:10 ` Rob Herring
2012-07-13 17:27 ` Mike Turquette [this message]
2012-09-10 6:14 Stephen Rothwell
2012-09-10 15:24 ` Linus Walleij
2012-09-10 16:51 ` Mike Turquette
2012-10-30 4:06 Stephen Rothwell
2012-10-30 10:11 ` Mike Turquette
2012-10-30 10:39 ` Pawel Moll
2012-11-28 6:12 Stephen Rothwell
2013-02-02 12:27 Stephen Rothwell
2013-02-04 17:54 ` Mike Turquette
2013-04-19 7:27 Stephen Rothwell
2013-04-19 9:47 ` Pawel Moll
2013-06-17 7:27 Stephen Rothwell
2013-06-17 18:49 ` Mike Turquette
2014-01-13 5:06 Stephen Rothwell
2014-01-26 20:59 ` Tomasz Figa
2014-01-26 21:05 ` Tomasz Figa
2015-02-03 5:28 Stephen Rothwell
2015-02-03 5:31 Stephen Rothwell
2015-02-03 18:25 ` Mike Turquette
2016-03-01 3:57 Stephen Rothwell
2016-03-01 4:00 ` Stephen Rothwell
2016-03-01 8:38 ` Nicolas Ferre
2016-11-22 8:41 Stephen Rothwell
2016-11-22 9:36 ` Geert Uytterhoeven
2016-11-22 23:59 ` Stephen Rothwell
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=20120713172704.GO2772@gmail.com \
--to=mturquette@ti.com \
--cc=arnd@arndb.de \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=robherring2@gmail.com \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).