Merge branch 'locking/rwsem'