]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commit
projects / ceph-client.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 371dd43 b50776a)
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Apr 2019 16:38:01 +0000 (09:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Apr 2019 16:38:01 +0000 (09:38 -0700)
commitde3af9a99013fdb0358bb990e9bed0172c65bba9
tree185896b154debbd5ee1832354e336aefb355e5eatree | snapshot
parent371dd432ab39f7bc55d6ec77d63b430285627e04commit | diff
parentb50776ae011cfd26df3cc2b4af8b2dc3b683e553commit | diff
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull locking fixes from Ingo Molnar:
 "A lockdep warning fix and a script execution fix when atomics are
  generated"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  locking/atomics: Don't assume that scripts are executable
  locking/lockdep: Make lockdep_unregister_key() honor 'debug_locks' again
Unnamed repository; edit this file 'description' to name the repository.