On Thu, Oct 17, 2013 at 10:23:19PM +0100, Mark Brown wrote: > Today's linux-next merge of the kvm-arm tree got conflicts in > mm/mprotect.c between c3d16e1652 (mm: migration: do not lose soft dirty > bit if page is in migration state) from Linus' tree and e920e14c (mm: Do > not flush TLB during protection change if !pte_present && > !migration_entry) from the tip tree. > > I've fixed up as below and can carry as required. > Thanks a lot, dirty bit handling looks good! Cyrill -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
