From: "Rafael J. Wysocki" <rjw@sisk•pl>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Jon Medhurst <tixy@yxit•co.uk>,
Russell King <rmk@arm•linux.org.uk>
Subject: Re: linux-next: manual merge of the pm tree with the arm tree
Date: Thu, 25 Aug 2011 16:28:18 +0200 [thread overview]
Message-ID: <201108251628.18531.rjw@sisk.pl> (raw)
In-Reply-To: <20110825133014.4ca16d7b383f7582c7a52d46@canb.auug.org.au>
On Thursday, August 25, 2011, Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in
> arch/arm/mach-shmobile/board-ap4evb.c between commit 9b742024026c ("ARM:
> mach-shmobile: Setup consistent dma size at boot time") from the arm tree
> and commit 2f82df20d71c ("PM: Move clock-related definitions and headers
> to separate file") from the pm tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Thanks a lot!
next prev parent reply other threads:[~2011-08-25 14:28 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-25 3:30 linux-next: manual merge of the pm tree with the arm tree Stephen Rothwell
2011-08-25 14:28 ` Rafael J. Wysocki [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-12-03 1:12 Stephen Rothwell
2014-12-03 1:45 ` 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=201108251628.18531.rjw@sisk.pl \
--to=rjw@sisk$(echo .)pl \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rmk@arm$(echo .)linux.org.uk \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tixy@yxit$(echo .)co.uk \
/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