]> git.ipfire.org Git - people/arne_f/kernel.git/commitdiff
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Feb 2016 20:02:05 +0000 (12:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Feb 2016 20:02:05 +0000 (12:02 -0800)
Pull lockdep fix from Thomas Gleixner:
 "A single fix for the stack trace caching logic in lockdep, where the
  duplicate avoidance managed to store no back trace at all"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  locking/lockdep: Fix stack trace caching logic

1  2 
kernel/locking/lockdep.c

Simple merge