Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux

All conflicts were trivial overlapping changes, so reasonably
easy to resolve.

Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
David S. Miller 2018-07-20 14:45:10 -07:00
commit c4c5551df1
598 changed files with 5366 additions and 2963 deletions

View file

@ -2881,6 +2881,8 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len)
goto out_free;
} else if (reserve) {
skb_reserve(skb, -reserve);
if (len < reserve)
skb_reset_network_header(skb);
}
/* Returns -EFAULT on error */