Merge git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6 (ebc79c4f) · Commits · 戴 / test

* git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6: includecheck fix: x86, cpu/common.c includecheck fix: kernel/trace, ring_buffer.c includecheck fix: include/linux, ftrace.h includecheck fix: include/linux, page_cgroup.h includecheck fix: include/linux, aio.h includecheck fix: include/drm, drm_memory.h includecheck fix: include/acpi, acpi_bus.h includecheck fix: drivers/xen, evtchn.c includecheck fix: drivers/video, vgacon.c includecheck fix: drivers/scsi, ibmvscsi.c includecheck fix: drivers/scsi, libfcoe.c includecheck fix: x86, shadow.c includecheck fix: x86, traps.c includecheck fix: um, helper.c includecheck fix: s390, sys_s390.c

arch/s390/kernel/sys_s390.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@
		#include <linux/personality.h>
		#include <linux/unistd.h>
		#include <linux/ipc.h>
		#include <linux/syscalls.h>
		#include <asm/uaccess.h>
		#include "entry.h"

arch/um/os-Linux/helper.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,6 @@
		#include "os.h"
		#include "um_malloc.h"
		#include "user.h"
		#include <linux/limits.h>

		struct helper_data {
		void (pre_exec)(void);

arch/x86/kernel/cpu/common.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@
		#include <asm/mce.h>
		#include <asm/msr.h>
		#include <asm/pat.h>
		#include <linux/smp.h>

		#ifdef CONFIG_X86_LOCAL_APIC
		#include <asm/uv/uv.h>

arch/x86/kernel/traps.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -65,7 +65,6 @@
		#else
		#include <asm/processor-flags.h>
		#include <asm/setup.h>
		#include <asm/traps.h>

		asmlinkage int system_call(void);

arch/x86/mm/kmemcheck/shadow.c

+0 −1

Original line number	Diff line number	Diff line
		#include <linux/kmemcheck.h>
		#include <linux/module.h>
		#include <linux/mm.h>
		#include <linux/module.h>

		#include <asm/page.h>
		#include <asm/pgtable.h>

Admin message