Merge branch 'topic/ioctl-use-define' into for-linus