diff options
| -rw-r--r-- | configs/fedora/generic/CONFIG_NET_SCH_CAKE | 2 | ||||
| -rw-r--r-- | kernel-aarch64-debug.config | 2 | ||||
| -rw-r--r-- | kernel-aarch64.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-debug.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae-debug.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl-lpae.config | 2 | ||||
| -rw-r--r-- | kernel-armv7hl.config | 2 | ||||
| -rw-r--r-- | kernel-i686-debug.config | 2 | ||||
| -rw-r--r-- | kernel-i686.config | 2 | ||||
| -rw-r--r-- | kernel-ppc64le-debug.config | 2 | ||||
| -rw-r--r-- | kernel-ppc64le.config | 2 | ||||
| -rw-r--r-- | kernel-s390x-debug.config | 2 | ||||
| -rw-r--r-- | kernel-s390x.config | 2 | ||||
| -rw-r--r-- | kernel-x86_64-debug.config | 2 | ||||
| -rw-r--r-- | kernel-x86_64.config | 2 | ||||
| -rw-r--r-- | kernel.spec | 1 |
16 files changed, 16 insertions, 15 deletions
diff --git a/configs/fedora/generic/CONFIG_NET_SCH_CAKE b/configs/fedora/generic/CONFIG_NET_SCH_CAKE index 1413c498e..17d6b6f7d 100644 --- a/configs/fedora/generic/CONFIG_NET_SCH_CAKE +++ b/configs/fedora/generic/CONFIG_NET_SCH_CAKE @@ -1 +1 @@ -# CONFIG_NET_SCH_CAKE is not set +CONFIG_NET_SCH_CAKE=m diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 80bf9e33c..76afbbb5c 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -3802,7 +3802,7 @@ CONFIG_NET_POLL_CONTROLLER=y CONFIG_NETROM=m CONFIG_NET_SB1000=y CONFIG_NET_SCH_ATM=m -# CONFIG_NET_SCH_CAKE is not set +CONFIG_NET_SCH_CAKE=m CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_CBS=m CONFIG_NET_SCH_CHOKE=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 1577e736d..3edbfd90f 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -3781,7 +3781,7 @@ CONFIG_NET_POLL_CONTROLLER=y CONFIG_NETROM=m CONFIG_NET_SB1000=y CONFIG_NET_SCH_ATM=m -# CONFIG_NET_SCH_CAKE is not set +CONFIG_NET_SCH_CAKE=m CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_CBS=m CONFIG_NET_SCH_CHOKE=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index d04b908f4..231113a1c 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -3998,7 +3998,7 @@ CONFIG_NET_PKTGEN=m CONFIG_NET_POLL_CONTROLLER=y CONFIG_NETROM=m CONFIG_NET_SCH_ATM=m -# CONFIG_NET_SCH_CAKE is not set +CONFIG_NET_SCH_CAKE=m CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_CBS=m CONFIG_NET_SCH_CHOKE=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 1bf161992..7c8166eac 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -3824,7 +3824,7 @@ CONFIG_NET_PKTGEN=m CONFIG_NET_POLL_CONTROLLER=y CONFIG_NETROM=m CONFIG_NET_SCH_ATM=m -# CONFIG_NET_SCH_CAKE is not set +CONFIG_NET_SCH_CAKE=m CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_CBS=m CONFIG_NET_SCH_CHOKE=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index b0be088fa..36af6a94f 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -3804,7 +3804,7 @@ CONFIG_NET_PKTGEN=m CONFIG_NET_POLL_CONTROLLER=y CONFIG_NETROM=m CONFIG_NET_SCH_ATM=m -# CONFIG_NET_SCH_CAKE is not set +CONFIG_NET_SCH_CAKE=m CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_CBS=m CONFIG_NET_SCH_CHOKE=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 49baa9cee..99a1a0185 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -3978,7 +3978,7 @@ CONFIG_NET_PKTGEN=m CONFIG_NET_POLL_CONTROLLER=y CONFIG_NETROM=m CONFIG_NET_SCH_ATM=m -# CONFIG_NET_SCH_CAKE is not set +CONFIG_NET_SCH_CAKE=m CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_CBS=m CONFIG_NET_SCH_CHOKE=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index a71b14ccd..3e871dbe5 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -3627,7 +3627,7 @@ CONFIG_NET_POLL_CONTROLLER=y CONFIG_NETROM=m # CONFIG_NET_SB1000 is not set CONFIG_NET_SCH_ATM=m -# CONFIG_NET_SCH_CAKE is not set +CONFIG_NET_SCH_CAKE=m CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_CBS=m CONFIG_NET_SCH_CHOKE=m diff --git a/kernel-i686.config b/kernel-i686.config index c99ddd754..e2aaab9ed 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -3607,7 +3607,7 @@ CONFIG_NET_POLL_CONTROLLER=y CONFIG_NETROM=m # CONFIG_NET_SB1000 is not set CONFIG_NET_SCH_ATM=m -# CONFIG_NET_SCH_CAKE is not set +CONFIG_NET_SCH_CAKE=m CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_CBS=m CONFIG_NET_SCH_CHOKE=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 09b08342a..4793b4b71 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -3378,7 +3378,7 @@ CONFIG_NET_PKTGEN=m CONFIG_NET_POLL_CONTROLLER=y CONFIG_NETROM=m CONFIG_NET_SCH_ATM=m -# CONFIG_NET_SCH_CAKE is not set +CONFIG_NET_SCH_CAKE=m CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_CBS=m CONFIG_NET_SCH_CHOKE=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 9542ce8f3..ec703520f 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -3356,7 +3356,7 @@ CONFIG_NET_PKTGEN=m CONFIG_NET_POLL_CONTROLLER=y CONFIG_NETROM=m CONFIG_NET_SCH_ATM=m -# CONFIG_NET_SCH_CAKE is not set +CONFIG_NET_SCH_CAKE=m CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_CBS=m CONFIG_NET_SCH_CHOKE=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 22a5e56d7..faad886e3 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -3316,7 +3316,7 @@ CONFIG_NET_PKTGEN=m CONFIG_NET_POLL_CONTROLLER=y CONFIG_NETROM=m CONFIG_NET_SCH_ATM=m -# CONFIG_NET_SCH_CAKE is not set +CONFIG_NET_SCH_CAKE=m CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_CBS=m CONFIG_NET_SCH_CHOKE=m diff --git a/kernel-s390x.config b/kernel-s390x.config index b35921db1..7bf2eb1c9 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -3294,7 +3294,7 @@ CONFIG_NET_PKTGEN=m CONFIG_NET_POLL_CONTROLLER=y CONFIG_NETROM=m CONFIG_NET_SCH_ATM=m -# CONFIG_NET_SCH_CAKE is not set +CONFIG_NET_SCH_CAKE=m CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_CBS=m CONFIG_NET_SCH_CHOKE=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index aaccd7428..27106ce5d 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -3666,7 +3666,7 @@ CONFIG_NET_POLL_CONTROLLER=y CONFIG_NETROM=m # CONFIG_NET_SB1000 is not set CONFIG_NET_SCH_ATM=m -# CONFIG_NET_SCH_CAKE is not set +CONFIG_NET_SCH_CAKE=m CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_CBS=m CONFIG_NET_SCH_CHOKE=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 2d54055f0..f12695218 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -3646,7 +3646,7 @@ CONFIG_NET_POLL_CONTROLLER=y CONFIG_NETROM=m # CONFIG_NET_SB1000 is not set CONFIG_NET_SCH_ATM=m -# CONFIG_NET_SCH_CAKE is not set +CONFIG_NET_SCH_CAKE=m CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_CBS=m CONFIG_NET_SCH_CHOKE=m diff --git a/kernel.spec b/kernel.spec index bc1a0bc33..4b805b919 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1885,6 +1885,7 @@ fi %changelog * Fri Dec 28 2018 Laura Abbott <labbott@redhat.com> - Enable CONFIG_BPF_LIRC_MODE2 (rhbz 1628151) +- Enable CONFIG_NET_SCH_CAKE (rhbz 1655155) * Fri Dec 28 2018 Laura Abbott <labbott@redhat.com> - 4.21.0-0.rc0.git2.1 - Linux v4.20-6428-g00c569b567c7 |