Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts: drivers/net/ethernet/intel/e1000e/netdev.c Minor conflict in e1000e, a line that got fixed in 'net' has been removed in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
2026-09-28 19:20:30 +00:00 · 2013-03-12 05:52:22 -04:00 · 2013-03-12 05:52:22 -04:00 · e5f2ef7ab4
commit e5f2ef7ab4
parent 30129cf28a 3da889b616
335 changed files with 2687 additions and 1609 deletions
--- a/6
+++ b/6
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
--- a/Documentation/hwmon/adm1275
+++ b/Documentation/hwmon/adm1275
--- a/Documentation/hwmon/adt7410
+++ b/Documentation/hwmon/adt7410
--- a/Documentation/hwmon/jc42
+++ b/Documentation/hwmon/jc42
--- a/Documentation/hwmon/lineage-pem
+++ b/Documentation/hwmon/lineage-pem
--- a/Documentation/hwmon/lm25066
+++ b/Documentation/hwmon/lm25066
--- a/Documentation/hwmon/ltc2978
+++ b/Documentation/hwmon/ltc2978
--- a/Documentation/hwmon/ltc4261
+++ b/Documentation/hwmon/ltc4261
--- a/Documentation/hwmon/max16064
+++ b/Documentation/hwmon/max16064
--- a/Documentation/hwmon/max16065
+++ b/Documentation/hwmon/max16065
--- a/Documentation/hwmon/max34440
+++ b/Documentation/hwmon/max34440
--- a/Documentation/hwmon/max8688
+++ b/Documentation/hwmon/max8688
--- a/Documentation/hwmon/pmbus
+++ b/Documentation/hwmon/pmbus
--- a/Documentation/hwmon/smm665
+++ b/Documentation/hwmon/smm665
--- a/Documentation/hwmon/ucd9000
+++ b/Documentation/hwmon/ucd9000
--- a/Documentation/hwmon/ucd9200
+++ b/Documentation/hwmon/ucd9200
--- a/Documentation/hwmon/zl6100
+++ b/Documentation/hwmon/zl6100
--- a/Documentation/input/alps.txt
+++ b/Documentation/input/alps.txt
--- a/Documentation/networking/tuntap.txt
+++ b/Documentation/networking/tuntap.txt
--- a/Documentation/power/opp.txt
+++ b/Documentation/power/opp.txt
--- a/Documentation/printk-formats.txt
+++ b/Documentation/printk-formats.txt
--- a/Documentation/trace/ftrace.txt
+++ b/Documentation/trace/ftrace.txt
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/arch/alpha/boot/head.S
+++ b/arch/alpha/boot/head.S
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
--- a/arch/arm/include/asm/mmu.h
+++ b/arch/arm/include/asm/mmu.h
--- a/arch/arm/include/asm/mmu_context.h
+++ b/arch/arm/include/asm/mmu_context.h
--- a/arch/arm/include/asm/tlbflush.h
+++ b/arch/arm/include/asm/tlbflush.h
--- a/arch/arm/include/uapi/asm/unistd.h
+++ b/arch/arm/include/uapi/asm/unistd.h
--- a/arch/arm/kernel/asm-offsets.c
+++ b/arch/arm/kernel/asm-offsets.c
--- a/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
--- a/arch/arm/kernel/hw_breakpoint.c
+++ b/arch/arm/kernel/hw_breakpoint.c
--- a/arch/arm/kernel/perf_event.c
+++ b/arch/arm/kernel/perf_event.c
--- a/arch/arm/kernel/perf_event_v7.c
+++ b/arch/arm/kernel/perf_event_v7.c
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
--- a/arch/arm/kernel/smp_tlb.c
+++ b/arch/arm/kernel/smp_tlb.c
--- a/arch/arm/kernel/smp_twd.c
+++ b/arch/arm/kernel/smp_twd.c
--- a/arch/arm/kernel/suspend.c
+++ b/arch/arm/kernel/suspend.c
--- a/arch/arm/lib/memset.S
+++ b/arch/arm/lib/memset.S
--- a/arch/arm/mach-netx/generic.c
+++ b/arch/arm/mach-netx/generic.c
--- a/arch/arm/mach-netx/include/mach/irqs.h
+++ b/arch/arm/mach-netx/include/mach/irqs.h
--- a/arch/arm/mm/context.c
+++ b/arch/arm/mm/context.c
--- a/arch/arm/mm/idmap.c
+++ b/arch/arm/mm/idmap.c
--- a/arch/arm/mm/proc-v7-3level.S
+++ b/arch/arm/mm/proc-v7-3level.S
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
--- a/arch/metag/include/asm/elf.h
+++ b/arch/metag/include/asm/elf.h
--- a/arch/metag/mm/Kconfig
+++ b/arch/metag/mm/Kconfig
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
--- a/arch/s390/hypfs/inode.c
+++ b/arch/s390/hypfs/inode.c
--- a/arch/s390/include/asm/cpu_mf.h
+++ b/arch/s390/include/asm/cpu_mf.h
--- a/arch/tile/include/asm/compat.h
+++ b/arch/tile/include/asm/compat.h
--- a/arch/tile/kernel/compat.c
+++ b/arch/tile/kernel/compat.c
--- a/arch/um/drivers/chan.h
+++ b/arch/um/drivers/chan.h
--- a/arch/um/drivers/chan_kern.c
+++ b/arch/um/drivers/chan_kern.c
--- a/arch/um/drivers/chan_user.c
+++ b/arch/um/drivers/chan_user.c
--- a/arch/um/drivers/chan_user.h
+++ b/arch/um/drivers/chan_user.h
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
--- a/arch/um/drivers/ssl.c
+++ b/arch/um/drivers/ssl.c
--- a/arch/um/drivers/stdio_console.c
+++ b/arch/um/drivers/stdio_console.c
--- a/arch/um/os-Linux/signal.c
+++ b/arch/um/os-Linux/signal.c
--- a/arch/um/os-Linux/start_up.c
+++ b/arch/um/os-Linux/start_up.c
--- a/arch/x86/include/asm/bootparam_utils.h
+++ b/arch/x86/include/asm/bootparam_utils.h
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
--- a/drivers/base/power/power.h
+++ b/drivers/base/power/power.h
--- a/drivers/base/power/qos.c
+++ b/drivers/base/power/qos.c
--- a/drivers/base/power/sysfs.c
+++ b/drivers/base/power/sysfs.c
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
--- a/drivers/cpufreq/cpufreq_governor.h
+++ b/drivers/cpufreq/cpufreq_governor.h
--- a/drivers/cpufreq/highbank-cpufreq.c
+++ b/drivers/cpufreq/highbank-cpufreq.c
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
--- a/drivers/gpu/drm/mgag200/mgag200_drv.h
+++ b/drivers/gpu/drm/mgag200/mgag200_drv.h
--- a/drivers/gpu/drm/mgag200/mgag200_i2c.c
+++ b/drivers/gpu/drm/mgag200/mgag200_i2c.c
--- a/drivers/gpu/drm/mgag200/mgag200_mode.c
+++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nve0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nve0.c
--- a/drivers/gpu/drm/nouveau/core/subdev/bios/init.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/bios/init.c
--- a/drivers/gpu/drm/nouveau/core/subdev/i2c/base.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/i2c/base.c
--- a/Show more
+++ b/Show more