From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 6 Jun 2018 00:31:33 +0000 (-0700)
Subject: Merge branch 'for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=af6c5d5e01ad9f2c9ca38cccaae6b5d67ddd241f;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'for-4.18' of git://git./linux/kernel/git/tj/wq

Pull workqueue updates from Tejun Heo:

 - make kworkers report the workqueue it is executing or has executed
   most recently in /proc/PID/comm (so they show up in ps/top)

 - CONFIG_SMP shuffle to move stuff which isn't necessary for UP builds
   inside CONFIG_SMP.

* 'for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: move function definitions within CONFIG_SMP block
  workqueue: Make sure struct worker is accessible for wq_worker_comm()
  workqueue: Show the latest workqueue name in /proc/PID/{comm,stat,status}
  proc: Consolidate task->comm formatting into proc_task_name()
  workqueue: Set worker->desc to workqueue name by default
  workqueue: Make worker_attach/detach_pool() update worker->pool
  workqueue: Replace pool->attach_mutex with global wq_pool_attach_mutex
---

af6c5d5e01ad9f2c9ca38cccaae6b5d67ddd241f