linux-next: manual merge of the hwpoison tree with the kvm tree
in [Kernel]
|
Prev: [PATCH] of/device: Move struct of_device define outside of CONFIG_OF_DEVICE test
Next: [PATCH 2/2] i2c: Add OF-style registration and binding
From: Stephen Rothwell on 10 Jun 2010 01:20 Hi Andi, Today's linux-next merge of the hwpoison tree got a conflict in mm/memory-failure.c between commit 7c5663142a8e9fbf31c82fc9ab6ebc3fda10d6b9 ("KVM: Avoid killing userspace through guest SRAO MCE on unmapped pages") from the kvm tree and commit 2164d3b53f002264d760c76799958ad7a48b9f41 ("HWPOISON, hugetlb: enable error handling path for hugepage") from the hwpoison tree. Just overlapping additions. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au diff --cc mm/memory-failure.c index 378b0f6,d0b420a..0000000 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@@ -45,7 -45,7 +45,8 @@@ #include <linux/page-isolation.h> #include <linux/suspend.h> #include <linux/slab.h> +#include <linux/swapops.h> + #include <linux/hugetlb.h> #include "internal.h" int sysctl_memory_failure_early_kill __read_mostly = 0; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |