summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-07-05 11:52:32 -0400
committerJosh Boyer <jwboyer@redhat.com>2012-07-05 11:52:32 -0400
commit31eb76de867676c8597240dfeee0b956da5fe1cd (patch)
treeb64346390cd1e3f9f687bff43500e601e3050ae1
parent415dc5f5c6ea928d57bfcd22b054da8b3a2080d4 (diff)
downloadkernel-31eb76de867676c8597240dfeee0b956da5fe1cd.tar.gz
kernel-31eb76de867676c8597240dfeee0b956da5fe1cd.tar.xz
kernel-31eb76de867676c8597240dfeee0b956da5fe1cd.zip
Move sch_htb module into main kernel package (rhbz 836185)
-rw-r--r--kernel.spec5
-rw-r--r--mod-extra.list1
2 files changed, 4 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec
index b410d04b8..d38e89ff9 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 1
+%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -2292,6 +2292,9 @@ fi
# ||----w |
# || ||
%changelog
+* Thu Jul 05 2012 Josh Boyer <jwboyer@redhat.com>
+- Move sch_htb module into main kernel package (rhbz 836185)
+
* Thu Jul 05 2012 Dennis Gilmore <dennis@ausil.us>
- enable cpu frequency scaling on omap systems
diff --git a/mod-extra.list b/mod-extra.list
index d4aefed35..b046afffe 100644
--- a/mod-extra.list
+++ b/mod-extra.list
@@ -46,7 +46,6 @@ sch_drr.ko
sch_dsmark.ko
sch_gred.ko
sch_hfsc.ko
-sch_htb.ko
sch_ingress.ko
sch_mqprio.ko
sch_multiq.ko