OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
67,617 Commits 4 Branches 0 Tags 2 GiB
Commit Graph

39 Commits

Author SHA1 Message Date
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
Linus Torvalds 19ad7ae47e Merge branch 'dmi-const' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6 
* 'dmi-const' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  drivers/firmware: const-ify DMI API and internals
 2007-10-11 19:18:45 -07:00
Thomas Gleixner 96a388de5d i386/x86_64: move headers to include/asm-x86 
Move the headers to include/asm-x86 and fixup the
header install make rules

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:20:03 +02:00
Thomas Gleixner 27bd0c9556 x86: sanitize pathes arch/x86/kernel/cpu/Makefile 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:17:26 +02:00
Thomas Gleixner 45bc6cd119 x86: sanitize pathes arch/x86/kernel/Makefile_64 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:17:25 +02:00
Thomas Gleixner c668ce14f5 x86: sanitize pathes arch/x86/kernel/Makefile_32 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:17:25 +02:00
Thomas Gleixner 250c22777f x86_64: move kernel 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:17:24 +02:00
Thomas Gleixner 2db55d344e x86_64: move ia32 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:17:21 +02:00
Thomas Gleixner 95119fbd87 x86_64: move mm 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:17:18 +02:00
Thomas Gleixner 9e9b4573e4 x86_64: move boot 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:17:15 +02:00
Thomas Gleixner f68c065491 x86_64: move pci 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:17:12 +02:00
Thomas Gleixner 7648b1330c x86_64: move vdso 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:17:10 +02:00
Thomas Gleixner 185f3d3890 x86_64: move lib 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:17:08 +02:00
Thomas Gleixner 51b2833060 x86_64: move kernel/cpufreq 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:17:06 +02:00
Thomas Gleixner e8d08eb1b5 x86_64: move kernel/acpi 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:17:05 +02:00
Thomas Gleixner 987c75d717 x86_64: move crypto 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:17:03 +02:00
Thomas Gleixner 9a163ed8e0 i386: move kernel 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:17:01 +02:00
Thomas Gleixner f7627e2513 i386: move kernel/cpu 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:16:58 +02:00
Thomas Gleixner 4ac24f63fd i386: move video 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:16:56 +02:00
Thomas Gleixner ff4395654d i386: move oprofile 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:16:55 +02:00
Thomas Gleixner 9402e12b8f i386: move mach-voyager 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:16:53 +02:00
Thomas Gleixner 9702785a74 i386: move xen 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:16:51 +02:00
Thomas Gleixner 334e621a01 i386: move mach-es7000 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:16:50 +02:00
Thomas Gleixner d629e03b64 i386: move mach-default 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:16:48 +02:00
Thomas Gleixner ad757b6aa5 i386: move mm 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:16:47 +02:00
Thomas Gleixner 96ae6ea0be i386: move boot 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:16:45 +02:00
Thomas Gleixner 0530bf37ce i386: move boot 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:16:43 +02:00
Thomas Gleixner 19d8d79ccf i386: move boot 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:16:41 +02:00
Thomas Gleixner c750a66b0e i386: move mach-generic 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:16:39 +02:00
Thomas Gleixner c2b84d8d1a i386: move mach-visws 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:16:38 +02:00
Thomas Gleixner fb9aa6f1d4 i386: move pci 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:16:36 +02:00
Thomas Gleixner 4b60eb8380 i386: move power 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:16:34 +02:00
Thomas Gleixner 44f0257fc3 i386: move lib 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:16:33 +02:00
Thomas Gleixner da957e111b i386: move math-emu 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:16:31 +02:00
Thomas Gleixner 2ec1df4130 i386: move kernel/cpu/mtrr 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:16:28 +02:00
Thomas Gleixner ee580dc91e i386: move kernel/cpu/cpufreq 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:16:27 +02:00
Thomas Gleixner c18db0d7e2 i386: move kernel/cpu/mcheck 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:16:25 +02:00
Thomas Gleixner 23d6f82bd1 i386: move kernel/acpi 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:16:23 +02:00
Thomas Gleixner 9c20194215 i386: move crypto 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
 2007-10-11 11:16:21 +02:00