Merge branch 'iov_iter' into for-next

diff --cc drivers/net/tun.c
Simple merge

diff --cc fs/dcache.c
Simple merge

diff --cc fs/nfs/blocklayout/rpc_pipefs.c
Simple merge

diff --cc fs/nfs/dir.c
Simple merge

diff --cc fs/notify/fsnotify.c
Simple merge

diff --cc fs/overlayfs/readdir.c
Simple merge

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

diff --cc kernel/trace/trace.c
Simple merge

diff --cc mm/memcontrol.c
Simple merge

diff --cc net/netfilter/nf_conntrack_proto_tcp.c
Simple merge

diff --cc net/netfilter/nfnetlink_queue_core.c
Simple merge

diff --cc security/integrity/ima/ima_appraise.c
Simple merge