Merge branch 'for-6.8-fixes' into for-6.9

The for-6.8-fixes commit ae9cc8956944 ("Revert "workqueue: Override implicit
ordered attribute in workqueue_apply_unbound_cpumask()") also fixes build for

Signed-off-by: Tejun Heo <tj@kernel.org>

diff --cc kernel/workqueue.c
index ecc775843bfa276f6ff638c3e3b6991b4762d698,7b482a26d74196c4505d7b45017ed153c75572fd..cf514ba0dfc3e0a6020f7d117041d7e002d7fb9d
--- 1/kernel/workqueue.c
--- 2/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@@ -6487,15 -5784,11 +6487,11 @@@ static int workqueue_apply_unbound_cpum
        lockdep_assert_held(&wq_pool_mutex);
  
        list_for_each_entry(wq, &workqueues, list) {
 -              if (!(wq->flags & WQ_UNBOUND))
 +              if (!(wq->flags & WQ_UNBOUND) || (wq->flags & __WQ_DESTROYING))
                        continue;
- 
                /* creating multiple pwqs breaks ordering guarantee */
-               if (!list_empty(&wq->pwqs)) {
-                       if (wq->flags & __WQ_ORDERED_EXPLICIT)
-                               continue;
-                       wq->flags &= ~__WQ_ORDERED;
-               }
+               if (wq->flags & __WQ_ORDERED)
+                       continue;
  
                ctx = apply_wqattrs_prepare(wq, wq->unbound_attrs, unbound_cpumask);
                if (IS_ERR(ctx)) {