Messages in this thread | | | Date | Tue, 25 Oct 2011 18:20:25 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the pm tree with the s390 tree |
| |
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in arch/s390/kernel/suspend.c between commit 4de2166b1804 ("[S390] sparse: fix sparse warnings about missing prototypes") from the s390 tree and commit 85055dd805f0 ("PM / Hibernate: Include storage keys in hibernation image on s390") from the pm tree.
I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/s390/kernel/suspend.c index 4f0fd55,b6f9afe..0000000 --- a/arch/s390/kernel/suspend.c +++ b/arch/s390/kernel/suspend.c @@@ -7,7 -7,7 +7,8 @@@ */ #include <linux/pfn.h> +#include <linux/suspend.h> + #include <linux/mm.h> #include <asm/system.h> /* [unhandled content-type:application/pgp-signature] | |