From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jason Cooper <jason@lakedaemon•net>,
andrew@lunn•ch, gregory.clement@free-electrons•com,
linux-arm-kernel@lists•infradead.org
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"Rafael J. Wysocki" <rafael.j.wysocki@intel•com>
Subject: linux-next: manual merge of the mvebu tree with Linus' tree
Date: Thu, 17 Jul 2014 11:44:44 +1000 [thread overview]
Message-ID: <20140717114444.15d99fc2@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 553 bytes --]
Hi all,
Today's linux-next merge of the mvebu tree got a conflict in
drivers/cpuidle/cpuidle-armada-370-xp.c between commit dc559aabe2d4
("cpuidle: mvebu: Fix the name of the states") from Linus' tree and
commit 742450174037 ("cpuidle: mvebu: rename the driver from
armada-370-xp to mvebu-v7") from the mvebu tree.
The former patch appears to have been applied to the
renamed file, so there was nothing to do (except remove the git created
version of the old file).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-07-17 1:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-17 1:44 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-07-14 1:06 linux-next: manual merge of the mvebu tree with Linus' tree Stephen Rothwell
2014-06-23 0:57 Stephen Rothwell
2014-06-23 12:21 ` Jason Cooper
2014-02-24 0:48 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=20140717114444.15d99fc2@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andrew@lunn$(echo .)ch \
--cc=gregory.clement@free-electrons$(echo .)com \
--cc=jason@lakedaemon$(echo .)net \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rafael.j.wysocki@intel$(echo .)com \
/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