tree 6050c4d21c53ea1f88d79f68e060a075a5a343a6
parent 85ec688c161a497c3becb6a056cd856552240227
parent 70044d71d31d6973665ced5be04ef39ac1c09a48
author Linus Torvalds <torvalds@linux-foundation.org> 1394308273 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1394308273 -0800

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

Pull workqueue fix from Tejun Heo:
 "This pull request contains a workqueue usage fix for firewire.

  For quite a long time now, workqueue only treats two work items
  identical iff both their addresses and callbacks match.  This is to
  avoid introducing false dependency through the work item being
  recycled while being executed.  This changes non-reentrancy guarantee
  for the users of PREPARE[_DELAYED]_WORK() - if the function changes,
  reentrancy isn't guaranteed against the previous instance.  Firewire
  depended on such nonreentrancy guarantee.

  This is fixed by doing the work item multiplexing from firewire proper
  while keeping the work function unchanged"

* 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  firewire: don't use PREPARE_DELAYED_WORK