Merge branch 'linus' into perf/core

Semantic conflict: arch/x86/kernel/cpu/perf_event_intel_ds.c

Merge reason: pick up latest fixes, fix the conflict

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 4 deletions

diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 277477251a86..e3877b6843c9 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -33,6 +33,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/gfp.h>
 #include <linux/pci.h>
 #include <linux/libata.h>
 #include <linux/highmem.h>
@@ -1815,10 +1816,6 @@ retry:
                             !ap->ops->sff_irq_check(ap))
                                 continue;
 
-                        if (printk_ratelimit())
-                                ata_port_printk(ap, KERN_INFO,
-                                                "clearing spurious IRQ\n");
-
                         if (idle & (1 << i)) {
                                 ap->ops->sff_check_status(ap);
                                 ap->ops->sff_irq_clear(ap);