Merge tag 'v3.10.48' into linux-linaro-lsk

This is the 3.10.48 stable release

diff --cc arch/arm64/kernel/entry.S
Simple merge

diff --cc mm/hugetlb.c
index 070051379f462a4ff695b19e4b3320d54f793743,dbc949c409c768b03bbba64a74f341a3d1c2e0cb..aa55badf57f7e6a3a16f3ee8be8531e455fb0493
--- 1/mm/hugetlb.c
--- 2/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@@ -2366,39 -2408,12 +2407,13 @@@ int copy_hugetlb_page_range(struct mm_s
                spin_unlock(&src->page_table_lock);
                spin_unlock(&dst->page_table_lock);
        }
 -      return 0;
  
 -nomem:
 -      return -ENOMEM;
 +      if (cow)
 +              mmu_notifier_invalidate_range_end(src, mmun_start, mmun_end);
 +
 +      return ret;
  }
  
- static int is_hugetlb_entry_migration(pte_t pte)
- {
-       swp_entry_t swp;
- 
-       if (huge_pte_none(pte) || pte_present(pte))
-               return 0;
-       swp = pte_to_swp_entry(pte);
-       if (non_swap_entry(swp) && is_migration_entry(swp))
-               return 1;
-       else
-               return 0;
- }
- 
- static int is_hugetlb_entry_hwpoisoned(pte_t pte)
- {
-       swp_entry_t swp;
- 
-       if (huge_pte_none(pte) || pte_present(pte))
-               return 0;
-       swp = pte_to_swp_entry(pte);
-       if (non_swap_entry(swp) && is_hwpoison_entry(swp))
-               return 1;
-       else
-               return 0;
- }
- 
  void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma,
                            unsigned long start, unsigned long end,
                            struct page *ref_page)