On Thu, Sep 07, 2017 at 06:57:36PM -0700, Nathan Chancellor wrote: > On Thu, Sep 07, 2017 at 04:48:52PM +0200, gregkh@xxxxxxxxxxxxxxxxxxx wrote: > > > > This is a note to let you know that I've just added the patch titled > > > > workqueue: Fix flag collision > > > > to the 4.4-stable tree which can be found at: > > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary > > > > The filename of the patch is: > > workqueue-fix-flag-collision.patch > > and it can be found in the queue-4.4 subdirectory. > > > > If you, or anyone else, feels it should not be added to the stable tree, > > please let <stable@xxxxxxxxxxxxxxx> know about it. > > > > > > From fbf1c41fc0f4d3574ac2377245efd666c1fa3075 Mon Sep 17 00:00:00 2001 > > From: Ben Hutchings <ben@xxxxxxxxxxxxxxx> > > Date: Sun, 3 Sep 2017 01:18:41 +0100 > > Subject: workqueue: Fix flag collision > > > > From: Ben Hutchings <ben@xxxxxxxxxxxxxxx> > > > > commit fbf1c41fc0f4d3574ac2377245efd666c1fa3075 upstream. > > > > 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@xxxxxxxxxxxxxxx> > > Signed-off-by: Tejun Heo <tj@xxxxxxxxxx> > > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > > > > --- > > include/linux/workqueue.h | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > --- a/include/linux/workqueue.h > > +++ b/include/linux/workqueue.h > > @@ -311,7 +311,7 @@ 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_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 */ > > > > > > Patches currently in stable-queue which might be from ben@xxxxxxxxxxxxxxx are > > > > queue-4.4/usb-xhci-fix-regression-when-ati-chipsets-detected.patch > > queue-4.4/workqueue-fix-flag-collision.patch > > Hey Greg, > > I don't think this patch makes sense in 3.18 or 4.4 as they don't have > the __WQ_LEGACY flag from 23d11a58a9a60dcb52c8fc6494efce908b24c295 > (which first appeared in 4.5). It make sense to keep the values the same as a previous patch modified them to make future changes easier, as well as just being consistent. thanks, greg k-h