[linux] 02/03: workqueue: Fix flag collision

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch stretch
in repository linux.

commit bc4b02f6ccb8f5311453825050f71918a0e580c4
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Sep 3 01:50:22 2017 +0100

    workqueue: Fix flag collision
---
 debian/changelog                                   |  1 +
 .../bugfix/all/workqueue-fix-flag-collision.patch  | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index bc35e38..b842810 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1185,6 +1185,7 @@ linux (4.9.46-1) UNRELEASED; urgency=medium
     systems (Closes: #862723)
   * [armhf] Add ARM Mali Midgard device tree bindings and gpu node for rk3288
     (thanks to Guillaume Tucker) (Closes: #865646)
+  * workqueue: Fix flag collision
 
   [ Cyril Brulebois ]
   * [arm64,armhf] udeb: Ship usb3503 module in usb-modules, needed for
diff --git a/debian/patches/bugfix/all/workqueue-fix-flag-collision.patch b/debian/patches/bugfix/all/workqueue-fix-flag-collision.patch
new file mode 100644
index 0000000..92a6b4b
--- /dev/null
+++ b/debian/patches/bugfix/all/workqueue-fix-flag-collision.patch
@@ -0,0 +1,29 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sun, 3 Sep 2017 01:12:54 +0100
+Subject: workqueue: Fix flag collision
+Forwarded: https://marc.info/?l=linux-kernel&m=150439794511799&w=2
+
+Commit 0a94efb5acbb ("workqueue: implicit ordered attribute should be
+overridable") introduced a __WQ_ORDERED_EXPLICIT flag but gave it the
+same value as __WQ_LEGACY.  I don't believe these were intended to
+mean the same thing, so renumber __WQ_ORDERED_EXPLICIT.
+
+Fixes: 0a94efb5acbb ("workqueue: implicit ordered attribute should be ...")
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Cc: stable at vger.kernel.org
+---
+ include/linux/workqueue.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/include/linux/workqueue.h
++++ b/include/linux/workqueue.h
+@@ -311,8 +311,8 @@ enum {
+ 
+ 	__WQ_DRAINING		= 1 << 16, /* internal: workqueue is draining */
+ 	__WQ_ORDERED		= 1 << 17, /* internal: workqueue is ordered */
+-	__WQ_ORDERED_EXPLICIT	= 1 << 18, /* internal: alloc_ordered_workqueue() */
+ 	__WQ_LEGACY		= 1 << 18, /* internal: create*_workqueue() */
++	__WQ_ORDERED_EXPLICIT	= 1 << 19, /* internal: alloc_ordered_workqueue() */
+ 
+ 	WQ_MAX_ACTIVE		= 512,	  /* I like 512, better ideas? */
+ 	WQ_MAX_UNBOUND_PER_CPU	= 4,	  /* 4 * #cpus for unbound wq */
diff --git a/debian/patches/series b/debian/patches/series
index d90a93c..2c4bebc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -89,6 +89,7 @@ bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch
 bugfix/all/kbuild-do-not-use-hyphen-in-exported-variable-name.patch
 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/workqueue-fix-flag-collision.patch
 
 # Miscellaneous features
 features/all/netfilter-nft_ct-add-notrack-support.patch

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