* linux-next: manual merge of the suspend tree with the mips tree
@ 2011-05-11 3:06 Stephen Rothwell
2011-05-11 19:31 ` Rafael J. Wysocki
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2011-05-11 3:06 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: linux-next, linux-kernel, Manuel Lauss, Ralf Baechle
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the suspend tree with the mips tree
@ 2011-05-11 3:06 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2011-05-11 3:06 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: linux-next, linux-kernel, Manuel Lauss, Ralf Baechle
[-- Attachment #1: Type: text/plain, Size: 520 bytes --]
Hi Rafael,
Today's linux-next merge of the suspend tree got a conflict in
arch/mips/alchemy/common/irq.c between commit 41bbb08bca72 ("MIPS:
Alchemy: Convert irq.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.
Again, I just used the version from the mips tree. I may have broken it,
of course.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the suspend tree with the mips tree
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
0 siblings, 0 replies; 3+ messages in thread
From: Rafael J. Wysocki @ 2011-05-11 19:31 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Manuel Lauss, Ralf Baechle
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-05-11 19:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
-- strict thread matches above, loose matches on Subject: below --
2011-05-11 3:06 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox