From: "Rafael J. Wysocki" <rjw@rjwysocki•net>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Ralf Baechle <ralf@linux-mips•org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Aaro Koskinen <aaro.koskinen@iki•fi>,
Stratos Karafotis <stratosk@semaphore•gr>
Subject: Re: linux-next: manual merge of the pm tree with the mips tree
Date: Thu, 01 May 2014 20:50:18 +0200 [thread overview]
Message-ID: <7356166.EVKMfYyT94@vostro.rjw.lan> (raw)
In-Reply-To: <20140501120932.ff26772f983a436b4453c915@canb.auug.org.au>
On Thursday, May 01, 2014 12:09:32 PM Stephen Rothwell wrote:
>
> --Signature=_Thu__1_May_2014_12_09_32_+1000_d7zY1SkU6vg6nEQn
> Content-Type: text/plain; charset=US-ASCII
> Content-Disposition: inline
> Content-Transfer-Encoding: quoted-printable
>
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in
> arch/mips/loongson/lemote-2f/clock.c between commit a68ce6507a45
> ("MIPS/loongson2_cpufreq: Fix CPU clock rate setting") from the mips tree
> and commit 4966ee4037fe ("mips: lemote 2f: Use cpufreq_for_each_entry
> macro for iteration") from the pm tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Thanks!
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
next prev parent reply other threads:[~2014-05-01 18:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-01 2:09 linux-next: manual merge of the pm tree with the mips tree Stephen Rothwell
2014-05-01 18:50 ` Rafael J. Wysocki [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-01-31 1:00 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=7356166.EVKMfYyT94@vostro.rjw.lan \
--to=rjw@rjwysocki$(echo .)net \
--cc=aaro.koskinen@iki$(echo .)fi \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ralf@linux-mips$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=stratosk@semaphore$(echo .)gr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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