David S. Miller 394efd19d5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/emulex/benet/be.h
	drivers/net/netconsole.c
	net/bridge/br_private.h

Three mostly trivial conflicts.

The net/bridge/br_private.h conflict was a function signature (argument
addition) change overlapping with the extern removals from Joe Perches.

In drivers/net/netconsole.c we had one change adjusting a printk message
whilst another changed "printk(KERN_INFO" into "pr_info(".

Lastly, the emulex change was a new inline function addition overlapping
with Joe Perches's extern removals.

Signed-off-by: David S. Miller <davem@davemloft.net>

2013-11-04 13:48:30 -05:00

..

acpi

Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-09-04 11:07:04 -07:00

apic

x86: Update UV3 hub revision ID

2013-10-15 08:44:46 +02:00

cpu

perf/x86: Fix NMI measurements

2013-10-29 12:01:20 +01:00

kprobes

Merge branch 'x86-asmlinkage-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-09-04 08:42:44 -07:00

.gitignore

…

alternative.c

kprobes/x86: Call out into INT3 handler directly instead of using notifier

2013-07-23 10:12:57 +02:00

amd_gart_64.c

x86, mm: use pfn_range_is_mapped() with gart

2012-11-17 11:59:10 -08:00

amd_nb.c

x86, amd_nb: Clarify F15h, model 30h GART and L3 support

2013-08-12 15:30:08 +02:00

apb_timer.c

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-02-19 20:11:07 -08:00

aperture_64.c

x86/mm/gart: Drop unnecessary check

2013-04-16 10:54:40 +02:00

apm_32.c

x86, asmlinkage, apm: Make APM data structure used from assembler visible

2013-08-06 14:20:20 -07:00

asm-offsets_32.c

x86: Get rid of ->hard_math and all the FPU asm fu

2013-06-06 14:32:04 -07:00

asm-offsets_64.c

x86, gdt, hibernate: Store/load GDT for hibernate path.

2013-05-02 11:27:35 -07:00

asm-offsets.c

x86, um/x86: switch to generic sys_execve and kernel_execve

2012-09-30 22:53:32 -04:00

audit_64.c

…

bootflag.c

…

check.c

…

cpuid.c

x86: delete __cpuinit usage from all x86 files

2013-07-14 19:36:56 -04:00

crash_dump_32.c

…

crash_dump_64.c

…

crash.c

x86/ioapic/kcrash: Prevent crash_kexec() from deadlocking on ioapic_lock

2013-08-20 09:26:33 +02:00

devicetree.c

of: Specify initrd location using 64-bit

2013-07-24 11:10:01 +01:00

doublefault.c

x86: Extend #DF debugging aid to 64-bit

2013-05-13 13:42:44 -07:00

dumpstack_32.c

dump_stack: unify debug information printed by show_regs()

2013-04-30 17:04:02 -07:00

dumpstack_64.c

dump_stack: unify debug information printed by show_regs()

2013-04-30 17:04:02 -07:00

dumpstack.c

dump_stack: consolidate dump_stack() implementations and unify their behaviors

2013-04-30 17:04:02 -07:00

e820.c

x86: avoid remapping data in parse_setup_data()

2013-08-13 23:29:19 -07:00

early_printk.c

early_printk: consolidate random copies of identical code

2013-04-29 18:28:13 -07:00

early-quirks.c

x86: add early quirk for reserving Intel graphics stolen memory v5

2013-09-03 19:17:57 +02:00

entry_32.S

x86-32, ftrace: Fix static ftrace when early microcode is enabled

2013-09-05 09:31:32 -04:00

entry_64.S

x86: Remove now-unused save_rest()

2013-09-10 09:31:55 +02:00

ftrace.c

x86/ftrace: Use __pa_symbol instead of __pa on C visible symbols

2012-11-16 16:42:09 -08:00

head32.c

x86, asmlinkage: Make _*_start_kernel visible

2013-08-06 14:18:26 -07:00

head64.c

x86, asmlinkage: Make _*_start_kernel visible

2013-08-06 14:18:26 -07:00

head_32.S

Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-09-04 09:11:16 -07:00

head_64.S

x86: Make sure IDT is page aligned

2013-07-16 15:14:48 -07:00

head.c

x86: Make sure we can boot in the case the BDA contains pure garbage

2013-02-27 13:38:57 -08:00

hpet.c

x86, hpet: Introduce x86_msi_ops.setup_hpet_msi

2013-01-28 10:48:30 +01:00

hw_breakpoint.c

ptrace/x86: flush_ptrace_hw_breakpoint() shoule clear the virtual debug registers

2013-07-09 10:33:26 -07:00

i386_ksyms_32.c

x86-32: Add support for 64bit get_user()

2013-02-07 15:07:28 -08:00

i387.c

x86, fpu: correct the asm constraints for fxsave, unbreak mxcsr.daz

2013-07-26 09:11:56 -07:00

i8237.c

…

i8253.c

…

i8259.c

x86/irq/i8259: Fix incorrect comment

2012-08-22 09:34:24 +02:00

io_delay.c

…

ioport.c

x86: get rid of pt_regs argument of iopl(2)

2013-02-03 18:16:24 -05:00

irq_32.c

x86: delete __cpuinit usage from all x86 files

2013-07-14 19:36:56 -04:00

irq_64.c

…

irq_work.c

x86, asmlinkage: Make all interrupt handlers asmlinkage / __visible

2013-08-06 14:18:23 -07:00

irq.c

x86, asmlinkage: Make all interrupt handlers asmlinkage / __visible

2013-08-06 14:18:23 -07:00

irqinit.c

KVM: VMX: Register a new IPI for posted interrupt

2013-04-16 16:32:39 -03:00

jump_label.c

x86/jump_label: expect default_nop if static_key gets enabled on boot-up

2013-10-19 19:45:35 -04:00

kdebugfs.c

…

kgdb.c

kgdb,x86: fix warning about unused variable

2012-10-12 06:37:34 -05:00

kvm.c

KVM: Fix modprobe failure for kvm_intel/kvm_amd

2013-10-30 12:10:42 +01:00

kvmclock.c

x86: delete __cpuinit usage from all x86 files

2013-07-14 19:36:56 -04:00

ldt.c

…

machine_kexec_32.c

…

machine_kexec_64.c

x86, kexec, 64bit: Only set ident mapping for ram.

2013-01-29 15:26:35 -08:00

Makefile

x86: sysfb: move EFI quirks from efifb to sysfb

2013-08-02 16:17:47 -07:00

microcode_amd_early.c

x86, microcode, AMD: Fix early microcode loading

2013-08-12 18:32:45 +02:00

microcode_amd.c

x86/microcode/AMD: Fix patch level reporting for family 15h

2013-09-27 09:29:27 +02:00

microcode_core_early.c

x86: delete __cpuinit usage from all x86 files

2013-07-14 19:36:56 -04:00

microcode_core.c

x86: delete __cpuinit usage from all x86 files

2013-07-14 19:36:56 -04:00

microcode_intel_early.c

x86: delete __cpuinit usage from all x86 files

2013-07-14 19:36:56 -04:00

microcode_intel_lib.c

x86/microcode_intel_lib.c: Early update ucode on Intel's CPU

2013-01-31 13:19:14 -08:00

microcode_intel.c

x86/microcode_intel.h: Define functions and macros for early loading ucode

2013-01-31 13:18:50 -08:00

mmconf-fam10h_64.c

x86: delete __cpuinit usage from all x86 files

2013-07-14 19:36:56 -04:00

module.c

…

mpparse.c

…

msr.c

x86: delete __cpuinit usage from all x86 files

2013-07-14 19:36:56 -04:00

nmi_selftest.c

…

nmi.c

perf/x86: Fix NMI measurements

2013-10-29 12:01:20 +01:00

paravirt_patch_32.c

…

paravirt_patch_64.c

…

paravirt-spinlocks.c

x86, ticketlock: Add slowpath logic

2013-08-09 07:54:00 -07:00

paravirt.c

x86, paravirt: Remove duplicate definition for DEF_NATIVE

2013-09-04 09:46:43 -07:00

pci-calgary_64.c

…

pci-dma.c

x86/dma-debug: Bump PREALLOC_DMA_DEBUG_ENTRIES

2013-01-24 17:34:18 +01:00

pci-iommu_table.c

…

pci-nommu.c

…

pci-swiotlb.c

…

pcspeaker.c

…

perf_regs.c

perf: Fix off by one test in perf_reg_value()

2012-09-19 17:08:40 +02:00

probe_roms.c

x86/pci/probe_roms: Add missing __iomem annotation to pci_map_biosrom()

2012-09-05 10:52:25 +02:00

process_32.c

x86, asmlinkage: Make 32bit/64bit __switch_to visible

2013-08-06 14:18:30 -07:00

process_64.c

x86, asmlinkage: Make several variables used from assembler/linker script visible

2013-08-06 14:20:13 -07:00

process.c

x86, asmlinkage: Make several variables used from assembler/linker script visible

2013-08-06 14:20:13 -07:00

ptrace.c

ptrace/x86: cleanup ptrace_set_debugreg()

2013-07-09 10:33:26 -07:00

pvclock.c

remove sched notifier for cross-cpu migrations

2013-07-18 12:29:30 +02:00

quirks.c

x86, quirks: Shut-up a long-standing gcc warning

2013-04-02 16:03:34 -07:00

reboot_fixups_32.c

…

reboot.c

x86/reboot: Add reboot quirk for Dell Latitude E5410

2013-10-06 11:49:07 +02:00

relocate_kernel_32.S

x86, asm, cleanup: Replace open-coded control register values with symbolic

2013-06-25 16:26:06 -07:00

relocate_kernel_64.S

x86, reloc: Use xorl instead of xorq in relocate_kernel_64.S

2013-06-20 21:30:04 -07:00

resource.c

…

rtc.c

x86: Increase precision of x86_platform.get/set_wallclock()

2013-05-28 14:00:59 -07:00

setup_percpu.c

…

setup.c

Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-09-04 09:39:26 -07:00

signal.c

Merge branch 'x86-smap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-09-04 11:08:32 -07:00

smp.c

x86, asmlinkage: Make all interrupt handlers asmlinkage / __visible

2013-08-06 14:18:23 -07:00

smpboot.c

x86/smpboot: Fix announce_cpu() to printk() the last "OK" properly

2013-09-05 15:05:37 +02:00

stacktrace.c

…

step.c

ptrace: ensure arch_ptrace/ptrace_request can never race with SIGKILL

2013-01-22 10:08:00 -08:00

sys_x86_64.c

x86 get_unmapped_area: Access mmap_legacy_base through mm_struct member

2013-08-22 10:19:35 -07:00

syscall_32.c

x86, asmlinkage: Make syscall tables visible

2013-08-06 14:20:18 -07:00

syscall_64.c

x86, asmlinkage: Make syscall tables visible

2013-08-06 14:20:18 -07:00

sysfb_efi.c

x86: sysfb: move EFI quirks from efifb to sysfb

2013-08-02 16:17:47 -07:00

sysfb_simplefb.c

x86/simplefb: Mark framebuffer mem-resources as IORESOURCE_BUSY to avoid bootup warning

2013-10-03 07:51:11 +02:00

sysfb.c

x86: sysfb: move EFI quirks from efifb to sysfb

2013-08-02 16:17:47 -07:00

tboot.c

x86 / tboot / ACPI: Fail extended mode reduced hardware sleep

2013-07-31 14:25:51 +02:00

tce_64.c

…

test_nx.c

…

test_rodata.c

…

time.c

…

tls.c

make SYSCALL_DEFINE<n>-generated wrappers do asmlinkage_protect

2013-03-03 22:58:33 -05:00

tls.h

…

topology.c

x86, topology: Debug CPU0 hotplug

2012-11-14 15:28:11 -08:00

trace_clock.c

tracing,x86: Add a TSC trace_clock

2012-11-13 15:48:27 -05:00

tracepoint.c

x86: Make sure IDT is page aligned

2013-07-16 15:14:48 -07:00

traps.c

kprobes/x86: Call out into INT3 handler directly instead of using notifier

2013-07-23 10:12:57 +02:00

tsc_sync.c

x86: delete __cpuinit usage from all x86 files

2013-07-14 19:36:56 -04:00

tsc.c

perf/x86: Add ability to calculate TSC from perf sample timestamps

2013-07-23 12:17:45 +02:00

uprobes.c

uretprobes/x86: Hijack return address

2013-04-13 15:31:55 +02:00

verify_cpu.S

…

vm86_32.c

x86, vm86: fix VM86 syscalls: use SYSCALL_DEFINEx(...)

2013-05-02 20:36:32 -04:00

vmlinux.lds.S

x86: Drop always empty .text..page_aligned section

2013-03-11 15:07:56 +01:00

vsmp_64.c

…

vsyscall_64.c

x86: delete __cpuinit usage from all x86 files

2013-07-14 19:36:56 -04:00

vsyscall_emu_64.S

…

vsyscall_trace.h

…

x86_init.c

Merge tag 'tegra-for-3.12-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/soc

2013-08-21 10:17:18 -07:00

x8664_ksyms_64.c

x86: Improve __phys_addr performance by making use of carry flags and inlining

2012-11-16 16:42:08 -08:00

xsave.c

x86: delete __cpuinit usage from all x86 files

2013-07-14 19:36:56 -04:00