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

diff --cc drivers/atm/zatm.c
Simple merge

diff --cc drivers/net/dsa/mv88e6xxx/chip.c
Simple merge

diff --cc drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
Simple merge

diff --cc drivers/net/usb/cdc_ncm.c
Simple merge

diff --cc include/net/af_unix.h
Simple merge

diff --cc kernel/bpf/verifier.c
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/filter.c
Simple merge

diff --cc net/core/skbuff.c
Simple merge

diff --cc net/ipv4/ip_output.c
Simple merge

diff --cc net/packet/af_packet.c
Simple merge

diff --cc net/sctp/sm_make_chunk.c
index 06dc351,6110447..0b36e96
--- 1/net/sctp/sm_make_chunk.c
--- 2/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@@ -223,12 -223,12 +223,12 @@@ struct sctp_chunk *sctp_make_init(cons
        struct sctp_chunk *retval = NULL;
        int num_types, addrs_len = 0;
        struct sctp_sock *sp;
 -      sctp_supported_addrs_param_t sat;
 +      struct sctp_supported_addrs_param sat;
        __be16 types[2];
 -      sctp_adaptation_ind_param_t aiparam;
 -      sctp_supported_ext_param_t ext_param;
 +      struct sctp_adaptation_ind_param aiparam;
 +      struct sctp_supported_ext_param ext_param;
        int num_ext = 0;
-       __u8 extensions[3];
+       __u8 extensions[4];
        struct sctp_paramhdr *auth_chunks = NULL,
                        *auth_hmacs = NULL;
  
@@@ -390,10 -393,10 +390,10 @@@ struct sctp_chunk *sctp_make_init_ack(c
        sctp_cookie_param_t *cookie;
        int cookie_len;
        size_t chunksize;
 -      sctp_adaptation_ind_param_t aiparam;
 -      sctp_supported_ext_param_t ext_param;
 +      struct sctp_adaptation_ind_param aiparam;
 +      struct sctp_supported_ext_param ext_param;
        int num_ext = 0;
-       __u8 extensions[3];
+       __u8 extensions[4];
        struct sctp_paramhdr *auth_chunks = NULL,
                        *auth_hmacs = NULL,
                        *auth_random = NULL;