Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (55 commits)
  workqueue: mark init_workqueues() as early_initcall()
  workqueue: explain for_each_*cwq_cpu() iterators
  fscache: fix build on !CONFIG_SYSCTL
  slow-work: kill it
  gfs2: use workqueue instead of slow-work
  drm: use workqueue instead of slow-work
  cifs: use workqueue instead of slow-work
  fscache: drop references to slow-work
  fscache: convert operation to use workqueue instead of slow-work
  fscache: convert object to use workqueue instead of slow-work
  workqueue: fix how cpu number is stored in work->data
  workqueue: fix mayday_mask handling on UP
  workqueue: fix build problem on !CONFIG_SMP
  workqueue: fix locking in retry path of maybe_create_worker()
  async: use workqueue for worker pool
  workqueue: remove WQ_SINGLE_CPU and use WQ_UNBOUND instead
  workqueue: implement unbound workqueue
  workqueue: prepare for WQ_UNBOUND implementation
  libata: take advantage of cmwq and remove concurrency limitations
  workqueue: fix worker management invocation without pending works
  ...

Fixed up conflicts in fs/cifs/* as per Tejun. Other trivial conflicts in
include/linux/workqueue.h, kernel/trace/Kconfig and kernel/workqueue.c

1 files changed, 0 insertions, 92 deletions

diff --git a/include/trace/events/workqueue.h b/include/trace/events/workqueue.h
deleted file mode 100644
index d6c974474e70..000000000000
--- a/include/trace/events/workqueue.h
+++ /dev/null
@@ -1,92 +0,0 @@
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM workqueue
-
-#if !defined(_TRACE_WORKQUEUE_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_WORKQUEUE_H
-
-#include <linux/workqueue.h>
-#include <linux/sched.h>
-#include <linux/tracepoint.h>
-
-DECLARE_EVENT_CLASS(workqueue,
-
-        TP_PROTO(struct task_struct *wq_thread, struct work_struct *work),
-
-        TP_ARGS(wq_thread, work),
-
-        TP_STRUCT__entry(
-                __array(char,           thread_comm,    TASK_COMM_LEN)
-                __field(pid_t,          thread_pid)
-                __field(work_func_t,    func)
-        ),
-
-        TP_fast_assign(
-                memcpy(__entry->thread_comm, wq_thread->comm, TASK_COMM_LEN);
-                __entry->thread_pid     = wq_thread->pid;
-                __entry->func           = work->func;
-        ),
-
-        TP_printk("thread=%s:%d func=%pf", __entry->thread_comm,
-                __entry->thread_pid, __entry->func)
-);
-
-DEFINE_EVENT(workqueue, workqueue_insertion,
-
-        TP_PROTO(struct task_struct *wq_thread, struct work_struct *work),
-
-        TP_ARGS(wq_thread, work)
-);
-
-DEFINE_EVENT(workqueue, workqueue_execution,
-
-        TP_PROTO(struct task_struct *wq_thread, struct work_struct *work),
-
-        TP_ARGS(wq_thread, work)
-);
-
-/* Trace the creation of one workqueue thread on a cpu */
-TRACE_EVENT(workqueue_creation,
-
-        TP_PROTO(struct task_struct *wq_thread, int cpu),
-
-        TP_ARGS(wq_thread, cpu),
-
-        TP_STRUCT__entry(
-                __array(char,   thread_comm,    TASK_COMM_LEN)
-                __field(pid_t,  thread_pid)
-                __field(int,    cpu)
-        ),
-
-        TP_fast_assign(
-                memcpy(__entry->thread_comm, wq_thread->comm, TASK_COMM_LEN);
-                __entry->thread_pid     = wq_thread->pid;
-                __entry->cpu            = cpu;
-        ),
-
-        TP_printk("thread=%s:%d cpu=%d", __entry->thread_comm,
-                __entry->thread_pid, __entry->cpu)
-);
-
-TRACE_EVENT(workqueue_destruction,
-
-        TP_PROTO(struct task_struct *wq_thread),
-
-        TP_ARGS(wq_thread),
-
-        TP_STRUCT__entry(
-                __array(char,   thread_comm,    TASK_COMM_LEN)
-                __field(pid_t,  thread_pid)
-        ),
-
-        TP_fast_assign(
-                memcpy(__entry->thread_comm, wq_thread->comm, TASK_COMM_LEN);
-                __entry->thread_pid     = wq_thread->pid;
-        ),
-
-        TP_printk("thread=%s:%d", __entry->thread_comm, __entry->thread_pid)
-);
-
-#endif /* _TRACE_WORKQUEUE_H */
-
-/* This part must be outside protection */
-#include <trace/define_trace.h>