diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-09-14 10:07:08 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-09-14 10:07:08 +0200 |
commit | 05fa34dcdb34d2a496ef89d8f361ca697643edec (patch) | |
tree | 1d5bddce044e2646776c5a315eec4211be3f3410 /Documentation/networking/dsa/configuration.rst | |
parent | f7dbcd17703157c0063c619714a765e3116caa83 (diff) | |
parent | 856deb866d16e29bd65952e0289066f6078af773 (diff) | |
download | lwn-05fa34dcdb34d2a496ef89d8f361ca697643edec.tar.gz lwn-05fa34dcdb34d2a496ef89d8f361ca697643edec.zip |
Merge 5.9-rc5 into char-misc-next
We want the char/misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/networking/dsa/configuration.rst')
-rw-r--r-- | Documentation/networking/dsa/configuration.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/dsa/configuration.rst b/Documentation/networking/dsa/configuration.rst index af029b3ca2ab..11bd5e6108c0 100644 --- a/Documentation/networking/dsa/configuration.rst +++ b/Documentation/networking/dsa/configuration.rst @@ -180,7 +180,7 @@ The configuration can only be set up via VLAN tagging and bridge setup. # bring up the slave interfaces ip link set lan1 up - ip link set lan1 up + ip link set lan2 up ip link set lan3 up # create bridge |