diff options
| author | David S. Miller <davem@davemloft.net> | 2014-12-10 23:48:20 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-12-10 23:48:20 +0300 |
| commit | 22f10923dd39141785273e423b9acf347297e15f (patch) | |
| tree | cc1f19103817433a426b3e329d6326f5e9d8e8f7 /net/sched/Kconfig | |
| parent | 785c20a08bead1e58ad53f2dc324782da7a0c9ea (diff) | |
| parent | 69204cf7eb9c5a72067ce6922d4699378251d053 (diff) | |
| download | linux-22f10923dd39141785273e423b9acf347297e15f.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/amd/xgbe/xgbe-desc.c
drivers/net/ethernet/renesas/sh_eth.c
Overlapping changes in both conflict cases.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/Kconfig')
| -rw-r--r-- | net/sched/Kconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/sched/Kconfig b/net/sched/Kconfig index 88618f8b794c..c54c9d9d1ffb 100644 --- a/net/sched/Kconfig +++ b/net/sched/Kconfig @@ -22,8 +22,9 @@ menuconfig NET_SCHED This code is considered to be experimental. To administer these schedulers, you'll need the user-level utilities - from the package iproute2+tc at <ftp://ftp.tux.org/pub/net/ip-routing/>. - That package also contains some documentation; for more, check out + from the package iproute2+tc at + <https://www.kernel.org/pub/linux/utils/net/iproute2/>. That package + also contains some documentation; for more, check out <http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2>. This Quality of Service (QoS) support will enable you to use @@ -336,7 +337,7 @@ config NET_SCH_PLUG of virtual machines by allowing the generated network output to be rolled back if needed. - For more information, please refer to http://wiki.xensource.com/xenwiki/Remus + For more information, please refer to <http://wiki.xenproject.org/wiki/Remus> Say Y here if you are using this kernel for Xen dom0 and want to protect Xen guests with Remus. |