linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the moduleh tree with the pm tree
@ 2011-10-06  5:27 Stephen Rothwell
  0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2011-10-06  5:27 UTC (permalink / raw)
  To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Barry Song, Rafael J. Wysocki

[-- Attachment #1: Type: text/plain, Size: 897 bytes --]

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
kernel/power/hibernate.c between commit 55415f553b8b ("PM / Hibernate:
Add resumewait param to support MMC-like devices as resume file") from
the pm tree and commit 5ee961c64584 ("kernel: Fix files explicitly
needing EXPORT_SYMBOL infrastructure") from the moduleh tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc kernel/power/hibernate.c
index 0f87850,ce21f25..0000000
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@@ -14,7 -14,7 +14,8 @@@
  #include <linux/reboot.h>
  #include <linux/string.h>
  #include <linux/device.h>
 +#include <linux/async.h>
+ #include <linux/export.h>
  #include <linux/kmod.h>
  #include <linux/delay.h>
  #include <linux/fs.h>

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

* linux-next: manual merge of the moduleh tree with the pm tree
@ 2011-08-11  5:02 Stephen Rothwell
  0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2011-08-11  5:02 UTC (permalink / raw)
  To: Paul Gortmaker; +Cc: linux-next, linux-kernel, ShuoX Liu, Rafael J. Wysocki

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
kernel/power/main.c between commit b57b760a97cf ("PM / Suspend: Add
statistics debugfs file for suspend to RAM") from the pm tree and commit
6320ae56afdf ("kernel: Fix files explicitly needing EXPORT_SYMBOL
infrastructure") from the moduleh tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc kernel/power/main.c
index 2757acb,a811007..0000000
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@@ -12,8 -12,7 +12,9 @@@
  #include <linux/string.h>
  #include <linux/resume-trace.h>
  #include <linux/workqueue.h>
 +#include <linux/debugfs.h>
 +#include <linux/seq_file.h>
+ #include <linux/export.h>
  
  #include "power.h"
  

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-10-06  5:28 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-10-06  5:27 linux-next: manual merge of the moduleh tree with the pm tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2011-08-11  5:02 Stephen Rothwell

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).