diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-08 16:58:19 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-08 16:59:34 +0000 |
| commit | b306a14ab81a53f568663c93f8d4cc22996f35fa (patch) | |
| tree | 6f4798ef73b8b0828fdada2f35a0be1d7e5681f5 /debian/config | |
| parent | Merging upstream version 6.1.82. (diff) | |
| download | linux-b306a14ab81a53f568663c93f8d4cc22996f35fa.tar.xz linux-b306a14ab81a53f568663c93f8d4cc22996f35fa.zip | |
Merging debian version 6.1.82-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/config')
| -rw-r--r-- | debian/config/config | 3 | ||||
| -rw-r--r-- | debian/config/defines | 2 |
2 files changed, 1 insertions, 4 deletions
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 6303821ef..909cc42f5 100644 --- a/debian/config/defines +++ b/debian/config/defines @@ -1,5 +1,5 @@ [abi] -abiname: 18progress7u1 +abiname: 19 ignore-changes: __cpuhp_* __udp_gso_segment |