commit | c958f9200fb48d092b17d3784168e4a6c56bbddc | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 31 13:57:45 2014 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 31 13:57:45 2014 -0700 |
tree | e5bdf4fa493521daf96a45ae6a82903189dd03b9 | |
parent | aea4869f68b5869afbb308bfb7d777d725df8900 [diff] | |
parent | 30a6b8031fe14031ab27c1fa3483cb9780e7f63c [diff] |
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull futex fixes from Ingo Molnar: "This contains two futex fixes: one fixes a race condition, the other clarifies shared/private futex comments" * 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: futex: Fix a race condition between REQUEUE_PI and task death futex: Mention key referencing differences between shared and private futexes