Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82bdc843 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' 

* akpm:
  mm: compaction: check pfn_valid when entering a new MAX_ORDER_NR_PAGES block during isolation for migration
  readahead: fix pipeline break caused by block plug
  kprobes: fix a memory leak in function pre_handler_kretprobe()
  drivers/tty/vt/vt_ioctl.c: fix KDFONTOP 32bit compatibility layer
  lkdtm: avoid calling lkdtm_do_action() with spinlock held
  mm/filemap_xip.c: fix race condition in xip_file_fault()
  mm/memcontrol.c: fix warning with CONFIG_NUMA=n
  avr32: select generic atomic64_t support
  mm: postpone migrated page mapping reset
  xtensa: fix memscan()
  MAINTAINERS: update lguest F: patterns
  MAINTAINERS: remove staging sections
  MAINTAINERS: remove iMX5 section
  MAINTAINERS: update partitions block F: patterns
parents 71b1b20b 0bf380bc

MAINTAINERS

+4 −15
Original line number Diff line number Diff line
@@ -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

arch/avr32/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/xtensa/include/asm/string.h

+0 −3
Original line number Diff line number Diff line
@@ -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 */

drivers/misc/lkdtm.c

+5 −1
Original line number Diff line number Diff line
@@ -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)

drivers/tty/vt/vt_ioctl.c

+0 −1
Original line number Diff line number Diff line
@@ -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;