Merge branch 'linus' into sched/core

Resolve cherry-picking conflicts:

Conflicts:
	mm/huge_memory.c
	mm/memory.c
	mm/mprotect.c

See this upstream merge commit for more details:

  52469b4fcd4f Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/include/asm/Kbuild
index 4e6838d,59ceae8..1a7024b
--- 1/arch/arm/include/asm/Kbuild
--- 2/arch/arm/include/asm/Kbuild
+++ b/arch/arm/include/asm/Kbuild
@@@ -31,6 -31,4 +31,5 @@@ generic-y += termbits.
  generic-y += termios.h
  generic-y += timex.h
  generic-y += trace_clock.h
- generic-y += types.h
  generic-y += unaligned.h
 +generic-y += preempt.h

diff --cc include/linux/sched.h
Simple merge

diff --cc mm/huge_memory.c
Simple merge

diff --cc mm/memory.c
Simple merge

diff --cc mm/migrate.c
Simple merge

diff --cc mm/mprotect.c
index a0302ac,412ba2b..a597f2f
--- 1/mm/mprotect.c
--- 2/mm/mprotect.c
+++ b/mm/mprotect.c
@@@ -89,11 -100,12 +90,13 @@@ static unsigned long change_pte_range(s
                                 * just be safe and disable write
                                 */
                                make_migration_entry_read(&entry);
-                               set_pte_at(mm, addr, pte,
-                                       swp_entry_to_pte(entry));
+                               newpte = swp_entry_to_pte(entry);
+                               if (pte_swp_soft_dirty(oldpte))
+                                       newpte = pte_swp_mksoft_dirty(newpte);
+                               set_pte_at(mm, addr, pte, newpte);
 +
 +                              pages++;
                        }
 -                      pages++;
                }
        } while (pte++, addr += PAGE_SIZE, addr != end);
        arch_leave_lazy_mmu_mode();