lkml.org 
[lkml]   [2011]   [Aug]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the moduleh tree with the pm tree
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"



\
 
 \ /
  Last update: 2011-08-11 07:05    [W:0.151 / U:0.084 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site