diff options
| author | Daiane Angolini <daiane.angolini@foundries.io> | 2022-11-08 09:22:19 -0300 |
|---|---|---|
| committer | Daiane Angolini <daiane.angolini@foundries.io> | 2022-11-08 10:41:24 -0300 |
| commit | 1f22d72becbd2dbab8a55ab9c00279aa28c05d48 (patch) | |
| tree | ff4db465fc0533cd2d1065525e5aff1762f9d8ba /tools/testing | |
| parent | 98415300084cf02728bd5b8bd283b74f3f0d9213 (diff) | |
| parent | 90c7e9b400c751dbd73885f494f421f90ca69721 (diff) | |
Merge tag 'v5.15.71' into 5.15-2.1.x-imx
This is the 5.15.71 stable release
Conflicts:
drivers/net/phy/aquantia_main.c
drivers/tty/serial/fsl_lpuart.c
Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io>
Diffstat (limited to 'tools/testing')
| -rwxr-xr-x | tools/testing/selftests/net/forwarding/sch_red.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/testing/selftests/net/forwarding/sch_red.sh b/tools/testing/selftests/net/forwarding/sch_red.sh index e714bae473fb..81f31179ac88 100755 --- a/tools/testing/selftests/net/forwarding/sch_red.sh +++ b/tools/testing/selftests/net/forwarding/sch_red.sh @@ -1,3 +1,4 @@ +#!/bin/bash # SPDX-License-Identifier: GPL-2.0 # This test sends one stream of traffic from H1 through a TBF shaper, to a RED |