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,
Manuel Lauss <manuel.lauss@googlemail•com>,
Ralf Baechle <ralf@linux-mips•org>
Subject: Re: linux-next: manual merge of the suspend tree with the mips tree
Date: Wed, 11 May 2011 21:31:58 +0200 [thread overview]
Message-ID: <201105112131.59135.rjw@sisk.pl> (raw)
In-Reply-To: <20110511130618.581a89a3.sfr@canb.auug.org.au>
On Wednesday, May 11, 2011, Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the suspend tree got a conflict in
> arch/mips/alchemy/common/dbdma.c between commit 02810a022fd9 ("MIPS:
> Alchemy: Convert dbdma.c to syscore_ops") from the mips tree and commit
> 4d0fb1376519 ("PM / MIPS: Use struct syscore_ops instead of sysdevs for
> PM (v2)") from the suspend tree.
>
> These seem to be trying to do the same thing. I used the version from
> the mips tree for now. Please sort this out ...
OK, I will drop the MIPS chanages from my tree.
Thanks,
Rafael
next prev parent reply other threads:[~2011-05-11 19:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-11 3:06 linux-next: manual merge of the suspend tree with the mips tree Stephen Rothwell
2011-05-11 19:31 ` Rafael J. Wysocki [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-05-11 3:06 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=201105112131.59135.rjw@sisk.pl \
--to=rjw@sisk$(echo .)pl \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=manuel.lauss@googlemail$(echo .)com \
--cc=ralf@linux-mips$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/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