asedeno.scripts.mit.edu Git - linux.git/commit

]> asedeno.scripts.mit.edu Git - linux.git/commit

author	Ingo Molnar <mingo@kernel.org>
	Tue, 7 Nov 2017 09:51:10 +0000 (10:51 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Tue, 7 Nov 2017 09:51:10 +0000 (10:51 +0100)
commit	141d3b1daacd11bdbd6fa74c2b163093e10d17ee
tree	04c98496f16ad2fe34c0cf4f31fedf4fe558c017	tree \| snapshot
parent	c201c91799d687c0a6d8c3272950f51aad5ffebe	commit \| diff
parent	e4880bc5dfb1f02b152e62a894b5c6f3e995b3cf	commit \| diff

Merge branch 'linus' into x86/apic, to resolve conflicts

Conflicts:
arch/x86/include/asm/x2apic.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>

31 files changed:

arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/desc.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/hw_irq.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/io_apic.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/irq.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/irq_vectors.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/irqdomain.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/trace/irq_vectors.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/x86_init.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/apic_noop.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/bigsmp_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/io_apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/x2apic_cluster.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/x2apic_phys.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/i8259.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irqinit.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/time.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/enlighten_pv.c	diff1 \|	diff2 \|	blob \| history
drivers/iommu/amd_iommu.c	diff1 \|	diff2 \|	blob \| history
drivers/iommu/intel_irq_remapping.c	diff1 \|	diff2 \|	blob \| history
drivers/irqchip/irq-gic-v3-its.c	diff1 \|	diff2 \|	blob \| history
include/linux/irq.h	diff1 \|	diff2 \|	blob \| history
include/linux/irqdesc.h	diff1 \|	diff2 \|	blob \| history
include/linux/irqdomain.h	diff1 \|	diff2 \|	blob \| history
include/linux/msi.h	diff1 \|	diff2 \|	blob \| history
kernel/irq/Makefile	diff1 \|	diff2 \|	blob \| history
kernel/irq/autoprobe.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/internals.h	diff1 \|	diff2 \|	blob \| history

local clone of linux.git

RSS Atom

arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/desc.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/hw_irq.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/io_apic.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/irq.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/irq_vectors.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/irqdomain.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/trace/irq_vectors.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/x86_init.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/apic_noop.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/bigsmp_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/io_apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/x2apic_cluster.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/x2apic_phys.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/i8259.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irqinit.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/time.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/enlighten_pv.c	diff1 \|	diff2 \|	blob \| history
drivers/iommu/amd_iommu.c	diff1 \|	diff2 \|	blob \| history
drivers/iommu/intel_irq_remapping.c	diff1 \|	diff2 \|	blob \| history
drivers/irqchip/irq-gic-v3-its.c	diff1 \|	diff2 \|	blob \| history
include/linux/irq.h	diff1 \|	diff2 \|	blob \| history
include/linux/irqdesc.h	diff1 \|	diff2 \|	blob \| history
include/linux/irqdomain.h	diff1 \|	diff2 \|	blob \| history
include/linux/msi.h	diff1 \|	diff2 \|	blob \| history
kernel/irq/Makefile	diff1 \|	diff2 \|	blob \| history
kernel/irq/autoprobe.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/internals.h	diff1 \|	diff2 \|	blob \| history