11 files changed, 41 insertions, 28 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 252972b6c4a0..8591c03354ef 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -789,12 +789,6 @@ F:	arch/arm/mach-mx*/
 F:      arch/arm/mach-imx/
 F:      arch/arm/plat-mxc/
 
-ARM/FREESCALE IMX51
-M:      Amit Kucheria <amit.kucheria@canonical.com>
-L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:      Maintained
-F:      arch/arm/mach-mx5/
-
 ARM/FREESCALE IMX6
 M:      Shawn Guo <shawn.guo@linaro.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -3992,11 +3986,11 @@ M:	Rusty Russell <rusty@rustcorp.com.au>
 L:      lguest@lists.ozlabs.org
 W:      http://lguest.ozlabs.org/
 S:      Odd Fixes
-F:      Documentation/virtual/lguest/
+F:      arch/x86/include/asm/lguest*.h
 F:      arch/x86/lguest/
 F:      drivers/lguest/
 F:      include/linux/lguest*.h
-F:      arch/x86/include/asm/lguest*.h
+F:      tools/lguest/
 
 LINUX FOR IBM pSERIES (RS/6000)
 M:      Paul Mackerras <paulus@au.ibm.com>
@@ -4136,7 +4130,7 @@ L:	linux-ntfs-dev@lists.sourceforge.net
 W:      http://www.linux-ntfs.org/content/view/19/37/
 S:      Maintained
 F:      Documentation/ldm.txt
-F:      fs/partitions/ldm.*
+F:      block/partitions/ldm.*
 
 LogFS
 M:      Joern Engel <joern@logfs.org>
@@ -5633,7 +5627,7 @@ W:	http://www.ibm.com/developerworks/linux/linux390/
 S:      Supported
 F:      arch/s390/
 F:      drivers/s390/
-F:      fs/partitions/ibm.c
+F:      block/partitions/ibm.c
 F:      Documentation/s390/
 F:      Documentation/DocBook/s390*
 
@@ -6396,11 +6390,6 @@ M:	Omar Ramirez Luna <omar.ramirez@ti.com>
 S:      Odd Fixes
 F:      drivers/staging/tidspbridge/
 
-STAGING - TRIDENT TVMASTER TMxxxx USB VIDEO CAPTURE DRIVERS
-L:      linux-media@vger.kernel.org
-S:      Odd Fixes
-F:      drivers/staging/tm6000/
-
 STAGING - USB ENE SM/MS CARD READER DRIVER
 M:      Al Cho <acho@novell.com>
 S:      Odd Fixes
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index 197e96f70405..3dea7231f637 100644
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -8,6 +8,7 @@ config AVR32
         select HAVE_KPROBES
         select HAVE_GENERIC_HARDIRQS
         select GENERIC_IRQ_PROBE
+        select GENERIC_ATOMIC64
         select HARDIRQS_SW_RESEND
         select GENERIC_IRQ_SHOW
         select ARCH_HAVE_NMI_SAFE_CMPXCHG
diff --git a/arch/xtensa/include/asm/string.h b/arch/xtensa/include/asm/string.h
index 5fb8c27cbef5..405a8c49ff2c 100644
--- a/arch/xtensa/include/asm/string.h
+++ b/arch/xtensa/include/asm/string.h
@@ -118,7 +118,4 @@ extern void *memmove(void *__dest, __const__ void *__src, size_t __n);
 /* Don't build bcopy at all ...  */
 #define __HAVE_ARCH_BCOPY
 
-#define __HAVE_ARCH_MEMSCAN
-#define memscan memchr
-
 #endif  /* _XTENSA_STRING_H */
diff --git a/drivers/misc/lkdtm.c b/drivers/misc/lkdtm.c
index 150cd7061b80..28adefe70f96 100644
--- a/drivers/misc/lkdtm.c
+++ b/drivers/misc/lkdtm.c
@@ -354,6 +354,7 @@ static void lkdtm_do_action(enum ctype which)
 static void lkdtm_handler(void)
 {
         unsigned long flags;
+        bool do_it = false;
 
         spin_lock_irqsave(&count_lock, flags);
         count--;
@@ -361,10 +362,13 @@ static void lkdtm_handler(void)
                         cp_name_to_str(cpoint), cp_type_to_str(cptype), count);
 
         if (count == 0) {
-                lkdtm_do_action(cptype);
+                do_it = true;
                 count = cpoint_count;
         }
         spin_unlock_irqrestore(&count_lock, flags);
+
+        if (do_it)
+                lkdtm_do_action(cptype);
 }
 
 static int lkdtm_register_cpoint(enum cname which)
diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
index 5e096f43bcea..65447c5f91d7 100644
--- a/drivers/tty/vt/vt_ioctl.c
+++ b/drivers/tty/vt/vt_ioctl.c
@@ -1463,7 +1463,6 @@ compat_kdfontop_ioctl(struct compat_console_font_op __user *fontop,
         if (!perm && op->op != KD_FONT_OP_GET)
                 return -EPERM;
         op->data = compat_ptr(((struct compat_console_font_op *)op)->data);
-        op->flags |= KD_FONT_FLAG_OLD;
         i = con_font_op(vc, op);
         if (i)
                 return i;
diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 29f5b65bee29..9788c0ec6f43 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -1673,8 +1673,12 @@ static int __kprobes pre_handler_kretprobe(struct kprobe *p,
                 ri->rp = rp;
                 ri->task = current;
 
-                if (rp->entry_handler && rp->entry_handler(ri, regs))
+                if (rp->entry_handler && rp->entry_handler(ri, regs)) {
+                        raw_spin_lock_irqsave(&rp->lock, flags);
+                        hlist_add_head(&ri->hlist, &rp->free_instances);
+                        raw_spin_unlock_irqrestore(&rp->lock, flags);
                         return 0;
+                }
 
                 arch_prepare_kretprobe(ri, regs);
 
diff --git a/mm/compaction.c b/mm/compaction.c
index 71a58f67f481..bd939a574b84 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -313,6 +313,19 @@ static isolate_migrate_t isolate_migratepages(struct zone *zone,
                 } else if (!locked)
                         spin_lock_irq(&zone->lru_lock);
 
+                /*
+                 * migrate_pfn does not necessarily start aligned to a
+                 * pageblock. Ensure that pfn_valid is called when moving
+                 * into a new MAX_ORDER_NR_PAGES range in case of large
+                 * memory holes within the zone
+                 */
+                if ((low_pfn & (MAX_ORDER_NR_PAGES - 1)) == 0) {
+                        if (!pfn_valid(low_pfn)) {
+                                low_pfn += MAX_ORDER_NR_PAGES - 1;
+                                continue;
+                        }
+                }
+
                 if (!pfn_valid_within(low_pfn))
                         continue;
                 nr_scanned++;
diff --git a/mm/filemap.c b/mm/filemap.c
index 97f49ed35bd2..b66275757c28 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1400,15 +1400,12 @@ generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
         unsigned long seg = 0;
         size_t count;
         loff_t *ppos = &iocb->ki_pos;
-        struct blk_plug plug;
 
         count = 0;
         retval = generic_segment_checks(iov, &nr_segs, &count, VERIFY_WRITE);
         if (retval)
                 return retval;
 
-        blk_start_plug(&plug);
-
         /* coalesce the iovecs and go direct-to-BIO for O_DIRECT */
         if (filp->f_flags & O_DIRECT) {
                 loff_t size;
@@ -1424,8 +1421,12 @@ generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
                         retval = filemap_write_and_wait_range(mapping, pos,
                                         pos + iov_length(iov, nr_segs) - 1);
                         if (!retval) {
+                                struct blk_plug plug;
+
+                                blk_start_plug(&plug);
                                 retval = mapping->a_ops->direct_IO(READ, iocb,
                                                         iov, pos, nr_segs);
+                                blk_finish_plug(&plug);
                         }
                         if (retval > 0) {
                                 *ppos = pos + retval;
@@ -1481,7 +1482,6 @@ generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
                         break;
         }
 out:
-        blk_finish_plug(&plug);
         return retval;
 }
 EXPORT_SYMBOL(generic_file_aio_read);
diff --git a/mm/filemap_xip.c b/mm/filemap_xip.c
index f91b2f687343..a4eb31132229 100644
--- a/mm/filemap_xip.c
+++ b/mm/filemap_xip.c
@@ -263,7 +263,12 @@ found:
                                                         xip_pfn);
                 if (err == -ENOMEM)
                         return VM_FAULT_OOM;
-                BUG_ON(err);
+                /*
+                 * err == -EBUSY is fine, we've raced against another thread
+                 * that faulted-in the same page
+                 */
+                if (err != -EBUSY)
+                        BUG_ON(err);
                 return VM_FAULT_NOPAGE;
         } else {
                 int err, ret = VM_FAULT_OOM;
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 556859fec4ef..6728a7ae6f2d 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -776,7 +776,8 @@ static void memcg_check_events(struct mem_cgroup *memcg, struct page *page)
         /* threshold event is triggered in finer grain than soft limit */
         if (unlikely(mem_cgroup_event_ratelimit(memcg,
                                                 MEM_CGROUP_TARGET_THRESH))) {
-                bool do_softlimit, do_numainfo;
+                bool do_softlimit;
+                bool do_numainfo __maybe_unused;
 
                 do_softlimit = mem_cgroup_event_ratelimit(memcg,
                                                 MEM_CGROUP_TARGET_SOFTLIMIT);
diff --git a/mm/migrate.c b/mm/migrate.c
index 9871a56d82c3..df141f60289e 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -445,7 +445,6 @@ void migrate_page_copy(struct page *newpage, struct page *page)
         ClearPageSwapCache(page);
         ClearPagePrivate(page);
         set_page_private(page, 0);
-        page->mapping = NULL;
 
         /*
          * If any waiters have accumulated on the new page then
@@ -667,6 +666,7 @@ static int move_to_new_page(struct page *newpage, struct page *page,
         } else {
                 if (remap_swapcache)
                         remove_migration_ptes(page, newpage);
+                page->mapping = NULL;
         }
 
         unlock_page(newpage);