Merge branch topic/uek-4.1/upstream-cherry-picks of git://ca-git.us.oracle.com/linux...

* topic/uek-4.1/upstream-cherry-picks:
  perf/core: Fix concurrent sys_perf_event_open() vs. 'move_group' race
  ext2: convert to mbcache2
  ext4: convert to mbcache2
  mbcache2: reimplement mbcache

diff --cc fs/Makefile
Simple merge

diff --cc fs/ext2/ext2.h
Simple merge

diff --cc fs/ext2/super.c
Simple merge

diff --cc fs/ext4/ext4.h
Simple merge

diff --cc fs/ext4/super.c
Simple merge

diff --cc kernel/events/core.c
Simple merge