Messages in this thread | | | Date | Thu, 11 Aug 2011 15:02:52 +1000 | From | Stephen Rothwell <> | Subject | linux-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"
| |