diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 15:09:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 15:09:20 -0800 |
| commit | 924d26df6b774b85c8b4548189b20e34f904a149 (patch) | |
| tree | 59e0810a0149a1f8f1d15613c50e4896993310d8 /Documentation | |
| parent | 66673f13c10a817e27d71434c1198a4d874e0cd3 (diff) | |
| parent | cd1f55a5b49b74e13ed9e7bc74d005803aaa0da8 (diff) | |
| download | op-kernel-dev-924d26df6b774b85c8b4548189b20e34f904a149.zip op-kernel-dev-924d26df6b774b85c8b4548189b20e34f904a149.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (92 commits)
gianfar: Revive VLAN support
vlan: Export symbols as non GPL symbols.
bnx2x: tx_has_work should not wait for FW
netxen: reduce memory footprint
netxen: fix vlan tso/checksum offload
net: Fix linux/if_frad.h's suitability for userspace.
net: Move config NET_NS to from net/Kconfig to init/Kconfig
isdn: Fix missing ifdef in isdn_ppp
networking: document "nc" in addition to "netcat" in netconsole.txt
e1000e: workaround hw errata
af_key: initialize xfrm encap_oa
virtio_net: Fix MAX_PACKET_LEN to support 802.1Q VLANs
lcs: fix compilation for !CONFIG_IP_MULTICAST
rtl8187: Add termination packet to prevent stall
iwlwifi: fix rs_get_rate WARN_ON()
p54usb: fix packet loss with first generation devices
sctp: Fix another socket race during accept/peeloff
sctp: Properly timestamp outgoing data chunks for rtx purposes
sctp: Correctly start rtx timer on new packet transmissions.
sctp: Fix crc32c calculations on big-endian arhes.
...
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/networking/netconsole.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/networking/netconsole.txt b/Documentation/networking/netconsole.txt index 3c2f2b3..8d02207 100644 --- a/Documentation/networking/netconsole.txt +++ b/Documentation/networking/netconsole.txt @@ -51,7 +51,8 @@ Built-in netconsole starts immediately after the TCP stack is initialized and attempts to bring up the supplied dev at the supplied address. -The remote host can run either 'netcat -u -l -p <port>' or syslogd. +The remote host can run either 'netcat -u -l -p <port>', +'nc -l -u <port>' or syslogd. Dynamic reconfiguration: ======================== |
