[linux] 10/13: bfq: Enable auto-loading when built as a module

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit aa404ad63b80e2c7cbaed2734ce953fbbbbbc5a4
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Aug 12 22:36:27 2017 +0100

    bfq: Enable auto-loading when built as a module
---
 debian/changelog                                   |  1 +
 ...nable-auto-loading-when-built-as-a-module.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index dfa3175..5676fc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,7 @@ linux (4.12.6-1) UNRELEASED; urgency=medium
   * blk-mq: Change MQ_IOSCHED_KYBER from built-in to module
   * blk-mq: Enable IOSCHED_BFQ as module (Closes: #869028); enable
     BFQ_GROUP_IOSCHED
+  * bfq: Enable auto-loading when built as a module
 
   [ Salvatore Bonaccorso ]
   * packet: fix tp_reserve race in packet_set_ring (CVE-2017-1000111)
diff --git a/debian/patches/bugfix/all/bfq-re-enable-auto-loading-when-built-as-a-module.patch b/debian/patches/bugfix/all/bfq-re-enable-auto-loading-when-built-as-a-module.patch
new file mode 100644
index 0000000..040f85b
--- /dev/null
+++ b/debian/patches/bugfix/all/bfq-re-enable-auto-loading-when-built-as-a-module.patch
@@ -0,0 +1,23 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 12 Aug 2017 22:27:06 +0100
+Subject: bfq: Re-enable auto-loading when built as a module
+
+The block core requests modules with the "-iosched" name suffix, but
+bfq no longer has that suffix.  Add an alias.
+
+Fixes: ea25da48086d ("block, bfq: split bfq-iosched.c into multiple ...")
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ block/bfq-iosched.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/block/bfq-iosched.c
++++ b/block/bfq-iosched.c
+@@ -4974,6 +4974,7 @@ static struct elevator_type iosched_bfq_
+ 	.elevator_name =	"bfq",
+ 	.elevator_owner =	THIS_MODULE,
+ };
++MODULE_ALIAS("bfq-iosched");
+ 
+ static int __init bfq_init(void)
+ {
diff --git a/debian/patches/series b/debian/patches/series
index 482a2dc..8b9ad8b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -85,6 +85,7 @@ bugfix/all/partially-revert-usb-kconfig-using-select-for-usb_co.patch
 bugfix/all/kbuild-include-addtree-remove-quotes-before-matching-path.patch
 bugfix/all/rtlwifi-fix-memory-leak-when-firmware-request-fails.patch
 bugfix/all/rtlwifi-fix-fallback-firmware-loading.patch
+bugfix/all/bfq-re-enable-auto-loading-when-built-as-a-module.patch
 
 # Miscellaneous features
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git