Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Sep 2017 01:24:14 +0000 (18:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Sep 2017 01:24:14 +0000 (18:24 -0700)
commite365806ac289457263a133bd32df8df49897f612
tree121636715f9180ad83d792252ae6d479164ec8cc
parent19240e6b2a6c456d1c2975400a04b6b01f957cf0
parentb776e4b1a990045a7c70798f1f353c3160c26594
Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs

Pull compat fix from Al Viro:
 "I really wish gcc warned about conversions from pointer to function
  into void *..."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix a typo in put_compat_shm_info()