Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Lots of simnple overlapping additions.

With a build fix from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2021-10-22 11:41:16 +01:00
364 changed files with 3812 additions and 2436 deletions

View File

@@ -54,7 +54,7 @@ struct mctp_sock {
struct sock sk;
/* bind() params */
int bind_net;
unsigned int bind_net;
mctp_eid_t bind_addr;
__u8 bind_type;