kevin/linux
1
Fork 0
Code
9a39e273d4
linux/arch/x86/kernel
History
Linus Torvalds 038a5008b2 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (867 commits)
  [SKY2]: status polling loop (post merge)
  [NET]: Fix NAPI completion handling in some drivers.
  [TCP]: Limit processing lost_retrans loop to work-to-do cases
  [TCP]: Fix lost_retrans loop vs fastpath problems
  [TCP]: No need to re-count fackets_out/sacked_out at RTO
  [TCP]: Extract tcp_match_queue_to_sack from sacktag code
  [TCP]: Kill almost unused variable pcount from sacktag
  [TCP]: Fix mark_head_lost to ignore R-bit when trying to mark L
  [TCP]: Add bytes_acked (ABC) clearing to FRTO too
  [IPv6]: Update setsockopt(IPV6_MULTICAST_IF) to support RFC 3493, try2
  [NETFILTER]: x_tables: add missing ip6t_modulename aliases
  [NETFILTER]: nf_conntrack_tcp: fix connection reopening
  [QETH]: fix qeth_main.c
  [NETLINK]: fib_frontend build fixes
  [IPv6]: Export userland ND options through netlink (RDNSS support)
  [9P]: build fix with !CONFIG_SYSCTL
  [NET]: Fix dev_put() and dev_hold() comments
  [NET]: make netlink user -> kernel interface synchronious
  [NET]: unify netlink kernel socket recognition
  [NET]: cleanup 3rd argument in netlink_sendskb
  ...

Fix up conflicts manually in Documentation/feature-removal-schedule.txt
and my new least favourite crap, the "mod_devicetable" support in the
files include/linux/mod_devicetable.h and scripts/mod/file2alias.c.

(The latter files seem to be explicitly _designed_ to get conflicts when
different subsystems work with them - that have an absolutely horrid
lack of subsystem separation!)

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-11 19:40:14 -07:00
..
acpi Merge branch 'dmi-const' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6 2007-10-11 19:18:45 -07:00
cpu Merge branch 'dmi-const' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6 2007-10-11 19:18:45 -07:00
cpufreq x86_64: move kernel/cpufreq 2007-10-11 11:17:06 +02:00
.gitignore i386: move kernel 2007-10-11 11:17:01 +02:00
alternative.c i386: move kernel 2007-10-11 11:17:01 +02:00
aperture_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
apic_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
apic_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
apm_32.c Merge branch 'dmi-const' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6 2007-10-11 19:18:45 -07:00
asm-offsets_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
asm-offsets_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
asm-offsets.c i386: move kernel 2007-10-11 11:17:01 +02:00
audit_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
bootflag.c i386: move kernel 2007-10-11 11:17:01 +02:00
bugs_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
cpuid.c i386: move kernel 2007-10-11 11:17:01 +02:00
crash_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
crash_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
crash_dump_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
crash_dump_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
doublefault_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
e820_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
e820_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
early_printk.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
early-quirks_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
efi_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
efi_stub_32.S i386: move kernel 2007-10-11 11:17:01 +02:00
entry_32.S i386: move kernel 2007-10-11 11:17:01 +02:00
entry_64.S x86_64: move kernel 2007-10-11 11:17:24 +02:00
genapic_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
genapic_flat_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
geode_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
head64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
head_32.S i386: move kernel 2007-10-11 11:17:01 +02:00
head_64.S x86_64: move kernel 2007-10-11 11:17:24 +02:00
hpet_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
hpet_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
i386_ksyms_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
i387_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
i387_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
i8237.c i386: move kernel 2007-10-11 11:17:01 +02:00
i8253_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
i8259_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
i8259_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
init_task_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
init_task_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
io_apic_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
io_apic_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
ioport_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
ioport_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
irq_32.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 2007-10-11 19:40:14 -07:00
irq_64.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 2007-10-11 19:40:14 -07:00
k8.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
kprobes_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
kprobes_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
ldt_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
ldt_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
machine_kexec_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
machine_kexec_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
Makefile x86_64: move kernel 2007-10-11 11:17:24 +02:00
Makefile_32 x86: sanitize pathes arch/x86/kernel/Makefile_32 2007-10-11 11:17:25 +02:00
Makefile_64 x86: sanitize pathes arch/x86/kernel/Makefile_64 2007-10-11 11:17:25 +02:00
mca_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
mce_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
mce_amd_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
mce_intel_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
microcode.c i386: move kernel 2007-10-11 11:17:01 +02:00
module_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
module_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
mpparse_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
mpparse_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
msr.c i386: move kernel 2007-10-11 11:17:01 +02:00
nmi_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
nmi_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
numaq_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
paravirt_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
pci-calgary_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
pci-dma_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
pci-dma_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
pci-gart_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
pci-nommu_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
pci-swiotlb_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
pcspeaker.c i386: move kernel 2007-10-11 11:17:01 +02:00
pmtimer_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
process_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
process_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
ptrace_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
ptrace_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
quirks.c i386: move kernel 2007-10-11 11:17:01 +02:00
reboot_32.c Merge branch 'dmi-const' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6 2007-10-11 19:18:45 -07:00
reboot_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
reboot_fixups_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
relocate_kernel_32.S i386: move kernel 2007-10-11 11:17:01 +02:00
relocate_kernel_64.S x86_64: move kernel 2007-10-11 11:17:24 +02:00
scx200_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
setup64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
setup_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
setup_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
sigframe_32.h i386: move kernel 2007-10-11 11:17:01 +02:00
signal_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
signal_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
smp_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
smp_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
smpboot_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
smpboot_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
smpcommon_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
srat_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
stacktrace.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
summit_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
suspend_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
suspend_asm_64.S x86_64: move kernel 2007-10-11 11:17:24 +02:00
sys_i386_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
sys_x86_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
syscall_64.c i386/x86_64: move headers to include/asm-x86 2007-10-11 11:20:03 +02:00
syscall_table_32.S i386: move kernel 2007-10-11 11:17:01 +02:00
sysenter_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
tce_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
time_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
time_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
topology.c i386: move kernel 2007-10-11 11:17:01 +02:00
trampoline_32.S i386: move kernel 2007-10-11 11:17:01 +02:00
trampoline_64.S x86_64: move kernel 2007-10-11 11:17:24 +02:00
traps_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
traps_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
tsc_32.c Merge branch 'dmi-const' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6 2007-10-11 19:18:45 -07:00
tsc_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
tsc_sync.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
verify_cpu_64.S x86_64: move kernel 2007-10-11 11:17:24 +02:00
vm86_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
vmi_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
vmiclock_32.c i386: move kernel 2007-10-11 11:17:01 +02:00
vmlinux_32.lds.S i386: move kernel 2007-10-11 11:17:01 +02:00
vmlinux_64.lds.S x86_64: move kernel 2007-10-11 11:17:24 +02:00
vmlinux.lds.S i386: move kernel 2007-10-11 11:17:01 +02:00
vsmp_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
vsyscall_32.lds.S i386: move kernel 2007-10-11 11:17:01 +02:00
vsyscall_32.S i386: move kernel 2007-10-11 11:17:01 +02:00
vsyscall_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00
vsyscall-int80_32.S i386: move kernel 2007-10-11 11:17:01 +02:00
vsyscall-note_32.S i386: move kernel 2007-10-11 11:17:01 +02:00
vsyscall-sigreturn_32.S i386: move kernel 2007-10-11 11:17:01 +02:00
vsyscall-sysenter_32.S i386: move kernel 2007-10-11 11:17:01 +02:00
x8664_ksyms_64.c x86_64: move kernel 2007-10-11 11:17:24 +02:00