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

Commit 59d8e5eb authored Mar 08, 2013 by Linus Torvalds

Merge branch 'akpm' (fixes from Andrew)

Merge misc fixes from Andrew Morton.

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  alpha: boot: fix build breakage introduced by system.h disintegration
  memcg: initialize kmem-cache destroying work earlier
  Randy has moved
  ksm: fix m68k build: only NUMA needs pfn_to_nid
  dmi_scan: fix missing check for _DMI_ signature in smbios_present()
  Revert parts of "hlist: drop the node parameter from iterators"
  idr: remove WARN_ON_ONCE() on negative IDs
  mm/mempolicy.c: fix sp_node_init() argument ordering
  mm/mempolicy.c: fix wrong sp_node insertion
  ipc: don't allocate a copy larger than max
  ipc: fix potential oops when src msg > 4k w/ MSG_COPY

parents c4c5ff09 c3d6b628

CREDITS

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -953,11 +953,11 @@ S: Blacksburg, Virginia 24061
	S: USA		S: USA

	N: Randy Dunlap		N: Randy Dunlap
	E: rdunlap@xenotime.net		E: rdunlap@infradead.org
	W: http://www.xenotime.net/linux/linux.html		W: http://www.infradead.org/~rdunlap/
	W: http://www.linux-usb.org
	D: Linux-USB subsystem, USB core/UHCI/printer/storage drivers		D: Linux-USB subsystem, USB core/UHCI/printer/storage drivers
	D: x86 SMP, ACPI, bootflag hacking		D: x86 SMP, ACPI, bootflag hacking
			D: documentation, builds
	S: (ask for current address)		S: (ask for current address)
	S: USA		S: USA

Documentation/SubmittingPatches

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -60,8 +60,7 @@ own source tree. For example:
	"dontdiff" is a list of files which are generated by the kernel during		"dontdiff" is a list of files which are generated by the kernel during
	the build process, and should be ignored in any diff(1)-generated		the build process, and should be ignored in any diff(1)-generated
	patch. The "dontdiff" file is included in the kernel tree in		patch. The "dontdiff" file is included in the kernel tree in
	2.6.12 and later. For earlier kernel versions, you can get it		2.6.12 and later.
	from <http://www.xenotime.net/linux/doc/dontdiff>.

	Make sure your patch does not include any extra files which do not		Make sure your patch does not include any extra files which do not
	belong in a patch submission. Make sure to review your patch -after-		belong in a patch submission. Make sure to review your patch -after-

Documentation/printk-formats.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -170,5 +170,5 @@ Reminder: sizeof() result is of type size_t.
	Thank you for your cooperation and attention.		Thank you for your cooperation and attention.


	By Randy Dunlap <rdunlap@xenotime.net> and		By Randy Dunlap <rdunlap@infradead.org> and
	Andrew Murray <amurray@mpc-data.co.uk>		Andrew Murray <amurray@mpc-data.co.uk>

arch/alpha/boot/head.S

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4,6 +4,7 @@
	* initial bootloader stuff..		* initial bootloader stuff..
	*/		*/

			#include <asm/pal.h>

	.set noreorder		.set noreorder
	.globl __start		.globl __start

drivers/firmware/dmi_scan.c

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -442,7 +442,6 @@ static int __init dmi_present(const char __iomem *p)
	static int __init smbios_present(const char __iomem *p)		static int __init smbios_present(const char __iomem *p)
	{		{
	u8 buf[32];		u8 buf[32];
	int offset = 0;

	memcpy_fromio(buf, p, 32);		memcpy_fromio(buf, p, 32);
	if ((buf[5] < 32) && dmi_checksum(buf, buf[5])) {		if ((buf[5] < 32) && dmi_checksum(buf, buf[5])) {
	@@ -461,9 +460,9 @@ static int __init smbios_present(const char __iomem *p)
	dmi_ver = 0x0206;		dmi_ver = 0x0206;
	break;		break;
	}		}
	offset = 16;		return memcmp(p + 16, "_DMI_", 5) \|\| dmi_present(p + 16);
	}		}
	return dmi_present(buf + offset);		return 1;
	}		}

	void __init dmi_scan_machine(void)		void __init dmi_scan_machine(void)