tree a5733e0740f9215d47ae98bfd181281b317c642c
parent 3a5af36b6d0e4a42ec2a8552ace87edbe2a90ae4
parent 0b405c65ad459f5f4d3db1672246172bd19d946d
author Linus Torvalds <torvalds@linux-foundation.org> 1537029549 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> 1537029549 -1000

Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull locking fixes from Ingo Molnar:
 "Misc fixes: liblockdep fixes and ww_mutex fixes"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  locking/ww_mutex: Fix spelling mistake "cylic" -> "cyclic"
  locking/lockdep: Delete unnecessary #include
  tools/lib/lockdep: Add dummy task_struct state member
  tools/lib/lockdep: Add empty nmi.h
  tools/lib/lockdep: Update Sasha Levin email to MSFT
  jump_label: Fix typo in warning message
  locking/mutex: Fix mutex debug call and ww_mutex documentation