From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Rafael J. Wysocki" <rjw@sisk•pl>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Manuel Lauss <manuel.lauss@googlemail•com>,
Ralf Baechle <ralf@linux-mips•org>
Subject: linux-next: manual merge of the suspend tree with the mips tree
Date: Wed, 11 May 2011 13:06:18 +1000 [thread overview]
Message-ID: <20110511130618.581a89a3.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 561 bytes --]
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 ...
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2011-05-11 3:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-11 3:06 Stephen Rothwell [this message]
2011-05-11 19:31 ` linux-next: manual merge of the suspend tree with the mips tree Rafael J. Wysocki
-- 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=20110511130618.581a89a3.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--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=rjw@sisk$(echo .)pl \
/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