| commit | e365806ac289457263a133bd32df8df49897f612 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Sep 25 18:24:14 2017 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Sep 25 18:24:14 2017 -0700 |
| tree | 121636715f9180ad83d792252ae6d479164ec8cc | |
| parent | 19240e6b2a6c456d1c2975400a04b6b01f957cf0 [diff] | |
| parent | b776e4b1a990045a7c70798f1f353c3160c26594 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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()