diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-11 22:40:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-11 22:40:14 -0400 |
| commit | 038a5008b2f395c85e6e71d6ddf3c684e7c405b0 (patch) | |
| tree | 4735eab577e97e5a22c3141e3f60071c8065585e /arch/mips | |
| parent | dd6d1844af33acb4edd0a40b1770d091a22c94be (diff) | |
| parent | 266918303226cceac7eca38ced30f15f277bd89c (diff) | |
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>
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/configs/bigsur_defconfig | 2 | ||||
| -rw-r--r-- | arch/mips/configs/sb1250-swarm_defconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig index 30f3e9a2466f..80b0c99c2cfb 100644 --- a/arch/mips/configs/bigsur_defconfig +++ b/arch/mips/configs/bigsur_defconfig | |||
| @@ -573,7 +573,7 @@ CONFIG_MII=y | |||
| 573 | # CONFIG_HAMACHI is not set | 573 | # CONFIG_HAMACHI is not set |
| 574 | # CONFIG_YELLOWFIN is not set | 574 | # CONFIG_YELLOWFIN is not set |
| 575 | # CONFIG_R8169 is not set | 575 | # CONFIG_R8169 is not set |
| 576 | CONFIG_NET_SB1250_MAC=y | 576 | CONFIG_SB1250_MAC=y |
| 577 | # CONFIG_SIS190 is not set | 577 | # CONFIG_SIS190 is not set |
| 578 | # CONFIG_SKGE is not set | 578 | # CONFIG_SKGE is not set |
| 579 | # CONFIG_SKY2 is not set | 579 | # CONFIG_SKY2 is not set |
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig index 3d1b6281d887..3ed991ae0ebe 100644 --- a/arch/mips/configs/sb1250-swarm_defconfig +++ b/arch/mips/configs/sb1250-swarm_defconfig | |||
| @@ -565,7 +565,7 @@ CONFIG_MII=y | |||
| 565 | # CONFIG_HAMACHI is not set | 565 | # CONFIG_HAMACHI is not set |
| 566 | # CONFIG_YELLOWFIN is not set | 566 | # CONFIG_YELLOWFIN is not set |
| 567 | # CONFIG_R8169 is not set | 567 | # CONFIG_R8169 is not set |
| 568 | CONFIG_NET_SB1250_MAC=y | 568 | CONFIG_SB1250_MAC=y |
| 569 | # CONFIG_SIS190 is not set | 569 | # CONFIG_SIS190 is not set |
| 570 | # CONFIG_SKGE is not set | 570 | # CONFIG_SKGE is not set |
| 571 | # CONFIG_SKY2 is not set | 571 | # CONFIG_SKY2 is not set |