From fbc787c3fed74f9a310515aed1d2d274e2a5e14e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 4 May 2024 12:10:52 +0200 Subject: Merging debian version 6.1.82-1. Signed-off-by: Daniel Baumann --- debian/config/config | 3 --- debian/config/defines | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'debian/config') diff --git a/debian/config/config b/debian/config/config index 38380d357..c08682ae6 100644 --- a/debian/config/config +++ b/debian/config/config @@ -7548,10 +7548,8 @@ CONFIG_RXKAD=y ## file: net/sched/Kconfig ## CONFIG_NET_SCHED=y -CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_HTB=m CONFIG_NET_SCH_HFSC=m -CONFIG_NET_SCH_ATM=m CONFIG_NET_SCH_PRIO=m CONFIG_NET_SCH_MULTIQ=m CONFIG_NET_SCH_RED=m @@ -7563,7 +7561,6 @@ CONFIG_NET_SCH_CBS=m CONFIG_NET_SCH_ETF=m CONFIG_NET_SCH_TAPRIO=m CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m CONFIG_NET_SCH_NETEM=m CONFIG_NET_SCH_DRR=m CONFIG_NET_SCH_MQPRIO=m diff --git a/debian/config/defines b/debian/config/defines index 6b60cfe9a..d4252f365 100644 --- a/debian/config/defines +++ b/debian/config/defines @@ -1,5 +1,5 @@ [abi] -abiname: 18progress6.99u1 +abiname: 19 ignore-changes: __cpuhp_* __udp_gso_segment -- cgit v1.2.3