Linus Torvalds 13220a94d3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1750 commits) ixgbe: Allow Priority Flow Control settings to survive a device reset net: core: remove unneeded include in net/core/utils.c. e1000e: update version number e1000e: fix close interrupt race e1000e: fix loss of multicast packets e1000e: commonize tx cleanup routine to match e1000 & igb netfilter: fix nf_logger name in ebt_ulog. netfilter: fix warning in ebt_ulog init function. netfilter: fix warning about invalid const usage e1000: fix close race with interrupt e1000: cleanup clean_tx_irq routine so that it completely cleans ring e1000: fix tx hang detect logic and address dma mapping issues bridge: bad error handling when adding invalid ether address bonding: select current active slave when enslaving device for mode tlb and alb gianfar: reallocate skb when headroom is not enough for fcb Bump release date to 25Mar2009 and version to 0.22 r6040: Fix second PHY address qeth: fix wait_event_timeout handling qeth: check for completion of a running recovery qeth: unregister MAC addresses during recovery. ... Manually fixed up conflicts in: drivers/infiniband/hw/cxgb3/cxio_hal.h drivers/infiniband/hw/nes/nes_nic.c		2009-03-26 15:54:36 -07:00
..
bigsmp	x86: fix cpu_mask_to_apicid_and to include cpu_online_mask	2008-12-18 11:59:24 +01:00
es7000	Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-01-10 06:13:09 -08:00
mach-default	x86: fix apic.c build error on latest git	2009-01-12 19:24:23 +01:00
mach-generic	x86: rename mp_config_table to mpc_table	2009-01-04 13:22:58 +01:00
mach-rdc321x
mach-voyager
numaq	Merge branches 'x86/cleanups', 'x86/mpparse', 'x86/numa' and 'x86/uv' into x86/urgent	2009-01-06 17:39:52 +01:00
summit	Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-01-10 06:13:09 -08:00
uv	x86: uv_bau.h: fix dubious bitfield	2008-12-30 13:31:37 -08:00
visws
xen	x86: don't apply __supported_pte_mask to non-present ptes	2009-02-04 21:33:09 -08:00
a.out-core.h	x86: include correct %gs in a.out core dump	2009-02-09 14:56:37 +01:00
a.out.h
acpi.h
aes.h	crypto: aes - Export x86 AES encrypt/decrypt functions	2009-02-18 16:48:05 +08:00
agp.h
alternative-asm.h
alternative.h
amd_iommu.h
amd_iommu_types.h	AMD IOMMU: add init code for statistic collection	2009-01-03 14:11:58 +01:00
apic.h	x86: apic.c: xapic_icr_read and x2apic_icr_read should be static	2008-12-30 13:31:28 -08:00
apicdef.h
arch_hooks.h
asm.h
atomic.h
atomic_32.h	atomic_t: unify all arch definitions	2009-01-06 15:59:10 -08:00
atomic_64.h	atomic_t: unify all arch definitions	2009-01-06 15:59:10 -08:00
auxvec.h
bios_ebda.h
bitops.h	x86, generic: mark complex bitops.h inlines as __always_inline	2009-01-13 18:56:30 +01:00
boot.h
bootparam.h
bug.h	allow bug table entries to use relative pointers (and use it on x86-64)	2008-12-16 18:40:32 +01:00
bugs.h
byteorder.h	byteorder: make swab.h include asm/swab.h like a regular header	2009-01-14 19:56:50 -08:00
cache.h
cacheflush.h
calgary.h
calling.h
checksum.h
checksum_32.h
checksum_64.h
cmpxchg.h
cmpxchg_32.h
cmpxchg_64.h
compat.h
cpu.h
cpufeature.h	crypto: aes-ni - Add support to Intel AES-NI instructions for x86_64 platform	2009-02-18 16:48:06 +08:00
cputime.h
current.h
debugreg.h
delay.h
desc.h	x86: fix lguest used_vectors breakage, -v2	2008-12-23 22:37:28 +01:00
desc_defs.h
device.h
div64.h
dma-mapping.h	Documentation: move DMA-mapping.txt to Doc/PCI/	2009-01-29 18:19:29 -08:00
dma.h
dmi.h
ds.h	x86, bts: add fork and exit handling	2008-12-20 09:15:46 +01:00
dwarf2.h	x86: move dwarf2 related macro to dwarf2.h	2008-11-23 13:20:52 +01:00
e820.h	headers_check fix: x86, e820.h	2009-01-31 00:16:22 +05:30
edac.h
efi.h	x86: EFI: Back efi_ioremap with init_memory_mapping instead of FIX_MAP	2009-03-04 19:20:16 +01:00
elf.h	[S390] arch_setup_additional_pages arguments	2008-12-25 13:38:54 +01:00
emergency-restart.h
errno.h
fb.h
fcntl.h
fixmap.h
fixmap_32.h
fixmap_64.h	x86: EFI: Back efi_ioremap with init_memory_mapping instead of FIX_MAP	2009-03-04 19:20:16 +01:00
floppy.h
frame.h
ftrace.h	x86: entry_64 - introduce FTRACE_ frame macro v2	2008-12-17 00:26:38 +01:00
futex.h
gart.h	x86: move GART specific stuff from iommu.h to gart.h	2008-11-28 13:06:27 +01:00
genapic.h
genapic_32.h	x86: rename mpc_config_processor to mpc_cpu	2009-01-04 13:23:00 +01:00
genapic_64.h	x86: cosmetic changes apic-related files.	2008-12-16 17:40:57 -08:00
geode.h
gpio.h
hardirq.h
hardirq_32.h	x86: hardirq: introduce inc_irq_stat()	2008-12-12 11:59:49 +01:00
hardirq_64.h	x86: hardirq: introduce inc_irq_stat()	2008-12-12 11:59:49 +01:00
highmem.h
hpet.h
hugetlb.h
hw_irq.h
hypertransport.h
hypervisor.h
i387.h	x86, math-emu: fix init_fpu for task != current	2009-03-04 20:33:16 +01:00
i8253.h
i8259.h
ia32.h	x86: ia32.h: remove unused struct sigfram32 and rt_sigframe32	2008-12-18 15:01:25 -08:00
ia32_unistd.h
idle.h	x86: kill #ifdef for exit_idle()	2008-12-12 11:58:36 +01:00
intel_arch_perfmon.h
io.h	x86: fix assumed to be contiguous leaf page tables for kmap_atomic region (take 2)	2009-01-16 13:47:04 +01:00
io_32.h
io_64.h	x86: remove dead BIO_VMERGE_BOUNDARY definition	2008-12-03 08:26:40 +01:00
io_apic.h	Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-12-30 16:20:19 -08:00
ioctl.h
ioctls.h
iomap.h	gpu/drm, x86, PAT: io_mapping_create_wc and resource_size_t	2009-02-25 13:09:51 +01:00
iommu.h	Merge branch 'core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-12-30 16:10:19 -08:00
ipcbuf.h
ipi.h	x86: cosmetic changes apic-related files.	2008-12-16 17:40:57 -08:00
irq.h	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask into merge-rr-cpumask	2009-01-03 18:53:31 +01:00
irq_regs.h
irq_regs_32.h
irq_regs_64.h
irq_remapping.h
irq_vectors.h	x86: use NR_IRQS_LEGACY	2008-12-08 14:31:52 +01:00
irqflags.h
ist.h
k8.h
Kbuild	byteorder: make swab.h include asm/swab.h like a regular header	2009-01-14 19:56:50 -08:00
kdebug.h
kexec.h
kgdb.h
kmap_types.h
kprobes.h
kvm.h	KVM: Avoid using CONFIG_ in userspace visible headers	2009-03-24 11:03:06 +02:00
kvm_host.h	KVM: Report IRQ injection status to userspace.	2009-03-24 11:03:11 +02:00
kvm_para.h
kvm_x86_emulate.h	KVM: x86 emulator: add Src2 decode set	2008-12-31 16:55:42 +02:00
ldt.h
lguest.h	x86: cleanup some remaining usages of NR_CPUS where s/b nr_cpu_ids	2009-01-03 19:00:55 +01:00
lguest_hcall.h
linkage.h	x86: introduce ENTRY(KPROBE_ENTRY)_X86 assembly helpers to catch unbalanced declaration v3	2008-11-23 19:57:01 +01:00
local.h
math_emu.h	x86: fix math_emu register frame access	2009-02-10 00:39:14 +01:00
mc146818rtc.h
mca.h
mca_dma.h
mce.h	headers_check fix: x86, mce.h	2009-01-31 00:17:13 +05:30
microcode.h
mman.h
mmconfig.h
mmu.h
mmu_context.h
mmu_context_32.h	x86, 32-bit: improve lazy TLB handling code	2008-12-16 18:47:17 +01:00
mmu_context_64.h
mmx.h
mmzone.h
mmzone_32.h	mm: clean up for early_pfn_to_nid()	2009-02-18 15:37:55 -08:00
mmzone_64.h	mm: clean up for early_pfn_to_nid()	2009-02-18 15:37:55 -08:00
module.h
mpspec.h	x86: find nr_irqs_gsi with mp_ioapic_routing	2009-02-09 12:42:59 +01:00
mpspec_def.h	x86: rename all fields of mpc_table mpc_X to X	2009-01-05 14:08:34 +01:00
msgbuf.h
msidef.h
msr-index.h	x86: Add EFER descriptions for FFXSR	2009-03-24 11:03:08 +02:00
msr.h	Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-12-28 12:21:10 -08:00
mtrr.h	headers_check fix: x86, mtrr.h	2009-01-31 00:17:39 +05:30
mutex.h
mutex_32.h
mutex_64.h
nmi.h
nops.h
numa.h
numa_32.h
numa_64.h
numaq.h
olpc.h
page.h	x86, pat: fix warn_on_once() while mapping 0-1MB range with /dev/mem	2009-02-12 08:27:27 +01:00
page_32.h
page_64.h
param.h
paravirt.h	Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-02-17 14:27:39 -08:00
parport.h
pat.h
pci-direct.h
pci.h	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-12-31 23:05:57 +10:30
pci_32.h
pci_64.h	x86: unify pci iommu setup and allow swiotlb to compile for 32 bit	2008-12-17 18:58:19 +01:00
pci_x86.h	x86, pci: move arch/x86/pci/pci.h to arch/x86/include/asm/pci_x86.h	2008-12-29 18:17:36 +01:00
pda.h
percpu.h
pgalloc.h	x86, mm: fix pte_free()	2009-01-23 18:42:06 +01:00
pgtable-2level-defs.h
pgtable-2level.h	x86: consolidate __swp_XXX() macros	2008-12-16 18:34:51 +01:00
pgtable-3level-defs.h
pgtable-3level.h	x86: consolidate __swp_XXX() macros	2008-12-16 18:34:51 +01:00
pgtable.h	x86: don't apply __supported_pte_mask to non-present ptes	2009-02-04 21:33:09 -08:00
pgtable_32.h	x86: PAT: change pgprot_noncached to uc_minus instead of strong uc - v3	2008-12-18 13:30:16 -08:00
pgtable_64.h	Merge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeature', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/detect-hyper', 'x86/doc', 'x86/dumpstack', 'x86/early-printk', 'x86/fpu', 'x86/idle', 'x86/io', 'x86/memory-corruption-check', 'x86/microcode', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/pat2', 'x86/pci-ioapic-boot-irq-quirks', 'x86/ptrace', 'x86/quirks', 'x86/reboot', 'x86/setup-memory', 'x86/signal', 'x86/sparse-fixes', 'x86/time', 'x86/uv' and 'x86/xen' into x86/core	2008-12-23 16:27:23 +01:00
poll.h
posix_types.h
posix_types_32.h
posix_types_64.h
prctl.h	x86: process_64.c declare __switch_to() and sys_arch_prctl before they get used	2008-12-16 21:10:27 +01:00
processor-cyrix.h
processor-flags.h
processor.h	x86: math_emu info cleanup	2009-02-09 14:56:39 +01:00
proto.h
ptrace-abi.h	headers_check fix: x86, ptrace-abi.h	2009-01-31 00:18:03 +05:30
ptrace.h	x86, bts: add fork and exit handling	2008-12-20 09:15:46 +01:00
pvclock-abi.h
pvclock.h
reboot.h
reboot_fixups.h
required-features.h
resource.h
resume-trace.h
rio.h
rtc.h
rwlock.h
rwsem.h
scatterlist.h
seccomp.h
seccomp_32.h	x86-64: seccomp: fix 32/64 syscall hole	2009-03-02 15:41:30 -08:00
seccomp_64.h	x86-64: seccomp: fix 32/64 syscall hole	2009-03-02 15:41:30 -08:00
sections.h
segment.h
sembuf.h
serial.h
setup.h	x86: rename mpc_config_oemtable to mpc_oemtable	2009-01-04 13:23:02 +01:00
shmbuf.h
shmparam.h
sigcontext.h	headers_check fix: x86, sigcontext.h	2009-01-31 00:18:30 +05:30
sigcontext32.h	headers_check fix: x86, sigcontext32.h	2009-01-31 00:18:58 +05:30
sigframe.h	x86: sigframe.h: include headers for dependency	2008-12-18 15:01:22 -08:00
siginfo.h
signal.h	x86: signal.c declare do_notify_resume before they get used	2008-12-16 21:10:28 +01:00
smp.h	x86: cleanup remaining cpumask_t ops in smpboot code	2009-01-04 15:39:26 +01:00
socket.h	net: new user space API for time stamping of incoming and outgoing packets	2009-02-15 22:43:33 -08:00
sockios.h
sparsemem.h	x86, mm: limit MAXMEM on 64-bit	2008-12-16 19:31:52 +01:00
spinlock.h	x86: spinlocks: define dummy __raw_spin_is_contended	2009-02-09 08:15:39 -08:00
spinlock_types.h
srat.h
stacktrace.h
stat.h
statfs.h
string.h
string_32.h
string_64.h
suspend.h
suspend_32.h
suspend_64.h
svm.h	KVM: SVM: Move EFER and MSR constants to generic x86 code	2009-03-24 11:02:46 +02:00
swab.h	headers_check fix: x86, swab.h	2009-01-31 00:19:32 +05:30
swiotlb.h	swiotlb: replace architecture-specific swiotlb.h with linux/swiotlb.h	2008-12-28 10:04:00 +01:00
sync_bitops.h
sys_ia32.h	x86: introducing asm/sys_ia32.h	2008-12-29 13:18:40 +01:00
syscall.h
syscalls.h	Revert "x86: signal: change type of paramter for sys_rt_sigreturn()"	2009-01-21 09:43:18 +01:00
system.h	Merge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeature', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/detect-hyper', 'x86/doc', 'x86/dumpstack', 'x86/early-printk', 'x86/fpu', 'x86/idle', 'x86/io', 'x86/memory-corruption-check', 'x86/microcode', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/pat2', 'x86/pci-ioapic-boot-irq-quirks', 'x86/ptrace', 'x86/quirks', 'x86/reboot', 'x86/setup-memory', 'x86/signal', 'x86/sparse-fixes', 'x86/time', 'x86/uv' and 'x86/xen' into x86/core	2008-12-23 16:27:23 +01:00
system_64.h
tce.h
termbits.h
termios.h
therm_throt.h
thread_info.h	Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-12-28 12:21:10 -08:00
time.h
timer.h	[CPUFREQ] p4-clockmod reports wrong frequency.	2009-02-24 22:47:32 -05:00
timex.h	x86: use standard PIT frequency	2009-01-25 16:57:47 +01:00
tlb.h
tlbflush.h
topology.h	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask into merge-rr-cpumask	2009-01-03 18:53:31 +01:00
trampoline.h	x86: change static allocation of trampoline area	2008-12-08 13:49:45 +01:00
traps.h	x86: fix math_emu register frame access	2009-02-10 00:39:14 +01:00
tsc.h
types.h
uaccess.h	Merge branch 'core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-12-30 16:10:19 -08:00
uaccess_32.h
uaccess_64.h	Merge commit 'v2.6.28-rc7' into core/locking	2008-12-04 08:52:14 +01:00
ucontext.h
unaligned.h
unistd.h
unistd_32.h
unistd_64.h
user.h
user32.h
user_32.h
user_64.h
vdso.h
vga.h
vgtod.h
vic.h
virtext.h	KVM: SVM: Move EFER and MSR constants to generic x86 code	2009-03-24 11:02:46 +02:00
vm86.h
vmi.h	x86 Fix VMI crash on boot in 2.6.28-rc8	2008-12-14 16:24:38 -08:00
vmi_time.h
vmware.h
vmx.h	KVM: x86: Virtualize debug registers	2009-03-24 11:02:49 +02:00
voyager.h
vsyscall.h
xcr.h
xor.h
xor_32.h
xor_64.h
xsave.h