Merge tag 'v3.10.42' into linux-3.10.x-grsecurity-2.9.1

This is the 3.10.42 stable release

Conflicts:
	mm/memory-failure.c

diff --cc Makefile
Simple merge

diff --cc arch/powerpc/kernel/process.c
Simple merge

diff --cc arch/x86/kernel/ldt.c
Simple merge

diff --cc arch/x86/vdso/vdso32-setup.c
Simple merge

diff --cc drivers/acpi/blacklist.c
Simple merge

diff --cc drivers/ata/libata-core.c
Simple merge

diff --cc drivers/char/ipmi/ipmi_si_intf.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
Simple merge

diff --cc drivers/irqchip/irq-gic.c
Simple merge

diff --cc drivers/md/md.c
Simple merge

diff --cc drivers/media/v4l2-core/v4l2-compat-ioctl32.c
Simple merge

diff --cc drivers/target/target_core_device.c
Simple merge

diff --cc fs/exec.c
Simple merge

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

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

diff --cc kernel/futex.c
Simple merge

diff --cc kernel/hrtimer.c
Simple merge

diff --cc kernel/module.c
index 6f17200e8ca02246e81df50370645b1c4af15913,10a3af821d2863c105a43e4ab3dc9be34615a15f..7a6eed11f22c9566d71e50b85a7c24bad1ddbb0f
--- 1/kernel/module.c
--- 2/kernel/module.c
+++ b/kernel/module.c
@@@ -3409,8 -3270,18 +3409,11 @@@ static int load_module(struct load_inf
  
        flush_module_icache(mod);
  
 -      /* Now copy in args */
 -      mod->args = strndup_user(uargs, ~0UL >> 1);
 -      if (IS_ERR(mod->args)) {
 -              err = PTR_ERR(mod->args);
 -              goto free_arch_cleanup;
 -      }
 -
        dynamic_debug_setup(info->debug, info->num_debug);
  
+       /* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
+       ftrace_module_init(mod);
+ 
        /* Finally it's fully formed, ready to start executing. */
        err = complete_formation(mod, info);
        if (err)

diff --cc kernel/timer.c
Simple merge

diff --cc kernel/trace/ftrace.c
Simple merge

diff --cc kernel/workqueue.c
Simple merge

diff --cc mm/memory-failure.c
index 74ad159c36e55997c59b52a4cd78704f6a035e66,4254eb0215838c50252670764f0648242e6fb066..df6a713186c0d9bef37b4f89f5ca995c7ba2e428
--- 1/mm/memory-failure.c
--- 2/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@@ -1083,15 -1083,16 +1083,16 @@@ int memory_failure(unsigned long pfn, i
                        return 0;
                } else if (PageHuge(hpage)) {
                        /*
-                        * Check "just unpoisoned", "filter hit", and
-                        * "race with other subpage."
+                        * Check "filter hit" and "race with other subpage."
                         */
                        lock_page(hpage);
-                       if (!PageHWPoison(hpage)
-                           || (hwpoison_filter(p) && TestClearPageHWPoison(p))
-                           || (p != hpage && TestSetPageHWPoison(hpage))) {
-                               atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
-                               return 0;
+                       if (PageHWPoison(hpage)) {
+                               if ((hwpoison_filter(p) && TestClearPageHWPoison(p))
+                                   || (p != hpage && TestSetPageHWPoison(hpage))) {
 -                                      atomic_long_sub(nr_pages, &num_poisoned_pages);
++                                      atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
+                                       unlock_page(hpage);
+                                       return 0;
+                               }
                        }
                        set_page_hwpoison_huge_page(hpage);
                        res = dequeue_hwpoisoned_huge_page(hpage);

diff --cc mm/memory.c
Simple merge

diff --cc mm/mremap.c
Simple merge

diff --cc mm/percpu.c
Simple merge

diff --cc net/mac80211/ieee80211_i.h
Simple merge

diff --cc net/mac80211/pm.c
Simple merge