openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/scripts
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
..
basic Fix occurrences of "the the " 2007-05-09 08:57:56 +02:00
genksyms blackfin architecture 2007-05-07 12:12:58 -07:00
kconfig kconfig: oldconfig shall not set symbols if it does not need to 2007-09-01 08:24:09 +02:00
ksymoops Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
mod 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
package x86_64: Support x86_64 in make buildtar 2007-05-21 09:56:56 -07:00
rt-tester [PATCH] rtmutex: Modify rtmutex-tester to test the setscheduler propagation 2006-06-27 17:32:47 -07:00
.gitignore [PATCH] Add unifdef to gitignore 2006-10-02 19:46:55 -07:00
Kbuild.include kbuild: New 'cc-fullversion' macro 2007-07-16 21:15:47 +02:00
Lindent Fix Lindent to not indent preprocessor comments so far 2007-07-20 08:45:38 -07:00
Makefile [PATCH] allow /proc/config.gz to be built as a module 2006-10-01 00:39:20 -07:00
Makefile.build kbuild: use LDFLAGS_MODULE only for .ko links 2007-07-25 21:18:19 +02:00
Makefile.clean kbuild: change kbuild to not rely on incorrect GNU make behavior 2006-03-06 00:09:51 +01:00
Makefile.headersinst kbuild: use POSIX BRE in headers install target 2007-07-17 14:24:55 +02:00
Makefile.host kbuild: enable use of code from a different dir 2007-05-06 09:23:45 +02:00
Makefile.lib kbuild: fix ia64 breakage after introducing make -rR 2006-07-01 09:58:02 +02:00
Makefile.modinst kbuild: add option for stripping modules while installing them 2006-06-24 23:16:45 +02:00
Makefile.modpost kbuild: use LDFLAGS_MODULE only for .ko links 2007-07-25 21:18:19 +02:00
bin2c.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
binoffset.c update the email address of Randy Dunlap 2006-01-03 13:37:51 +01:00
bloat-o-meter [PATCH] bloat-o-meter: gcc-4 fix 2006-06-25 10:01:00 -07:00
checkincludes.pl Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
checkpatch.pl update checkpatch.pl to version 0.09 2007-08-11 15:47:41 -07:00
checkstack.pl [AVR32] checkstack support 2007-10-11 12:16:56 +02:00
checksyscalls.sh i386/x86_64: move headers to include/asm-x86 2007-10-11 11:20:03 +02:00
checkversion.pl kbuild: introduce utsrelease.h 2006-07-03 23:30:54 +02:00
cleanfile scripts: Make cleanfile/cleanpatch warn about long lines 2007-07-16 21:15:50 +02:00
cleanpatch scripts: Make cleanfile/cleanpatch warn about long lines 2007-07-16 21:15:50 +02:00
conmakehash.c [PATCH] kbuild: signed char fixes for scripts 2005-07-27 22:27:08 +02:00
decodecode doc/oops-tracing: add Code: decode info 2007-07-16 09:05:48 -07:00
export_report.pl kbuild: export-symbol usage report generator 2006-06-24 23:14:02 +02:00
extract-ikconfig [PATCH] extract-ikconfig: don't use --long-options 2006-03-24 07:33:21 -08:00
gcc-version.sh kbuild: New 'cc-fullversion' macro 2007-07-16 21:15:47 +02:00
gcc-x86_64-has-stack-protector.sh [PATCH] Add the -fstack-protector option to the CFLAGS 2006-09-26 10:52:39 +02:00
gen_initramfs_list.sh kbuild: add support for squashing uid/gid in gen_initramfs_list.sh 2007-07-16 21:15:52 +02:00
hdrcheck.sh Use dependencies for 'make headers_install'. 2006-09-24 22:15:14 +01:00
kallsyms.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild 2007-07-19 14:28:19 -07:00
kernel-doc kernel-doc: fix leading dot in man-mode output 2007-07-19 10:04:45 -07:00
makelst [PATCH] kbuild scripts: replace gawk, head, bc with shell, update 2007-02-06 14:30:49 -08:00
mkcompile_h kbuild: override build timestamp & version 2007-05-02 20:58:09 +02:00
mkmakefile kbuild: Do not overwrite makefile as anohter user 2006-05-08 06:55:32 +02:00
mksysmap spelling: s/retreive/retrieve/ 2006-01-10 00:10:13 +01:00
mkuboot.sh kbuild/mkuboot.sh: allow spaces in CROSS_COMPILE 2007-05-02 20:58:10 +02:00
mkversion Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
namespace.pl x86: fixup the x86 namespace change in scripts/namespace.pl 2007-10-11 17:56:02 +02:00
patch-kernel update the email address of Randy Dunlap 2006-01-03 13:37:51 +01:00
pnmtologo.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
profile2linkerlist.pl [PATCH] x86_64: Basic reorder infrastructure 2006-03-25 09:10:56 -08:00
setlocalversion kbuild: append -dirty for updated but uncommited changes 2006-06-17 00:08:17 +02:00
show_delta kbuild: fix mode of checkstack.pl and other files. 2006-04-11 13:37:07 +02:00
unifdef.c kbuild: replace use of strlcpy with a dedicated implmentation in unifdef 2006-09-25 09:00:00 +02:00
ver_linux kbuild: fix up printing of Linux C Library version in scripts/ver_linux 2007-07-25 21:14:20 +02:00