Messages in this thread | | | Date | Thu, 6 Oct 2011 16:27:56 +1100 | 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/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> [unhandled content-type:application/pgp-signature] | |