From: Mike Turquette <mturquette@ti.com>
To: Linus Walleij <linus.walleij@linaro.org>,
Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Ulf Hansson <ulf.hansson@linaro.org>,
Loic PALLARDY <loic.pallardy@st.com>,
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: Mon, 10 Sep 2012 09:51:45 -0700 [thread overview]
Message-ID: <20120910165145.20289.71159@nucleus> (raw)
In-Reply-To: <CACRpkdbf94QG59pvqcN_grCG_tcpri7JyypZ9ZMu3R=LwvSoXw@mail.gmail.com>
Quoting Linus Walleij (2012-09-10 08:24:49)
> On Mon, Sep 10, 2012 at 8:14 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > Today's linux-next merge of the clk tree got a conflict in
> > arch/arm/mach-ux500/clock.c between commit 79964bcd792f ("ARM: ux500:
> > Correct Ux500 family names usage") from the arm-soc tree and commit
> > ebc96db7632f ("ARM: ux500: Switch to use common clock framework") from
> > the clk tree.
> >
> > The latter removed the file so I did that - there may be more fixup
> > required.
>
> This is the correct solution, thanks!
>
Yes. Removal of the file is the only fixup required.
Regards,
Mike
> Yours,
> Linus Walleij
WARNING: multiple messages have this Message-ID (diff)
From: mturquette@ti.com (Mike Turquette)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the clk tree with the arm-soc tree
Date: Mon, 10 Sep 2012 09:51:45 -0700 [thread overview]
Message-ID: <20120910165145.20289.71159@nucleus> (raw)
In-Reply-To: <CACRpkdbf94QG59pvqcN_grCG_tcpri7JyypZ9ZMu3R=LwvSoXw@mail.gmail.com>
Quoting Linus Walleij (2012-09-10 08:24:49)
> On Mon, Sep 10, 2012 at 8:14 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > Today's linux-next merge of the clk tree got a conflict in
> > arch/arm/mach-ux500/clock.c between commit 79964bcd792f ("ARM: ux500:
> > Correct Ux500 family names usage") from the arm-soc tree and commit
> > ebc96db7632f ("ARM: ux500: Switch to use common clock framework") from
> > the clk tree.
> >
> > The latter removed the file so I did that - there may be more fixup
> > required.
>
> This is the correct solution, thanks!
>
Yes. Removal of the file is the only fixup required.
Regards,
Mike
> Yours,
> Linus Walleij
next prev parent reply other threads:[~2012-09-10 16:51 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-10 6:14 linux-next: manual merge of the clk tree with the arm-soc tree 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 [this message]
2012-09-10 16:51 ` Mike Turquette
-- 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
2014-01-13 5:06 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
2014-01-26 21:05 ` Tomasz Figa
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-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=20120910165145.20289.71159@nucleus \
--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=loic.pallardy@st.com \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
--cc=ulf.hansson@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.