Skip to content

Commit c8b5376

Browse files
Deleted enable dropmon condition and moved patch
Signed-off-by: Vadym Hlushko <vadymh@nvidia.com>
1 parent c908c3d commit c8b5376

File tree

4 files changed

+2
-6
lines changed

4 files changed

+2
-6
lines changed

Makefile

-5
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,6 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
9999
stg repair
100100
stg import -s ../patch/series
101101

102-
if [[ $(ENABLE_SFLOW_DROPMON) == y ]]; then
103-
stg repair
104-
stg import -s ../patch/dropmon/series
105-
fi
106-
107102
# Optionally add/remove kernel options
108103
if [ -f ../manage-config ]; then
109104
../manage-config $(CONFIGURED_ARCH) $(CONFIGURED_PLATFORM)

patch/dropmon/series

-1
This file was deleted.

patch/series

+2
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@ kernel-compat-always-include-linux-compat.h-from-net-compat.patch
131131

132132
0001-net-prefer-socket-bound-to-interface-when-not-in-VRF.patch
133133

134+
0001-Psample-new-attr-tc-tc-occ-latency.patch
135+
134136
# Cisco patches for 5.10 kernel
135137
cisco-mtd-part.patch
136138
cisco-mdio-mux-support-acpi.patch

0 commit comments

Comments
 (0)