From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Andrew Lunn <andrew@lunn.ch>, Jason Cooper <jason@lakedaemon.net>
Subject: Re: linux-next: manual merge of the pm tree with Linus' tree
Date: Tue, 12 Aug 2014 03:11:06 +0200 [thread overview]
Message-ID: <1531979.9XksH4oX0M@vostro.rjw.lan> (raw)
In-Reply-To: <20140811114309.1426067b@canb.auug.org.au>
On Monday, August 11, 2014 11:43:09 AM Stephen Rothwell wrote:
>
> --Sig_/=CGwKOD1=eH3=syU/3wkRPC
> Content-Type: text/plain; charset=US-ASCII
> Content-Transfer-Encoding: quoted-printable
>
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in
> arch/arm/mach-kirkwood/pm.c between commit ba364fc752da ("ARM:
> Kirkwood: Remove mach-kirkwood") from Linus' tree and commit
> bb3274b6442d ("PM / sleep: Rename symbols, functions and variables
> related to sleep") from the pm tree.
>
> I fixed it up (I removed the file) and can carry the fix as necessary
> (no action is required).
Thanks a lot!
I've decided to drop the above commit for now.
Rafael
next prev parent reply other threads:[~2014-08-12 0:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-11 1:43 linux-next: manual merge of the pm tree with Linus' tree Stephen Rothwell
2014-08-12 1:11 ` Rafael J. Wysocki [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-10-29 2:01 Stephen Rothwell
2018-10-30 7:33 ` Rafael J. Wysocki
2015-11-08 23:45 Stephen Rothwell
2015-11-09 0:46 ` Rafael J. Wysocki
2015-11-08 23:45 Stephen Rothwell
2014-08-11 1:41 Stephen Rothwell
2012-05-18 5:48 Stephen Rothwell
2012-05-18 19:08 ` Rafael J. Wysocki
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=1531979.9XksH4oX0M@vostro.rjw.lan \
--to=rjw@rjwysocki.net \
--cc=andrew@lunn.ch \
--cc=jason@lakedaemon.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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).