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

diff --cc MAINTAINERS
Simple merge

diff --cc crypto/algif_skcipher.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Simple merge

diff --cc drivers/net/ethernet/emulex/benet/be.h
Simple merge

diff --cc drivers/net/ethernet/emulex/benet/be_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/en_netdev.c
Simple merge

diff --cc drivers/net/ethernet/renesas/sh_eth.c
Simple merge

diff --cc drivers/net/ethernet/ti/cpsw.c
Simple merge

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

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

diff --cc drivers/net/wireless/intel/iwlwifi/iwl-7000.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/sta.c
Simple merge

diff --cc lib/rhashtable.c
Simple merge

diff --cc net/bridge/br_stp_if.c
index 775e00f,12045de..905cedd
--- 1/net/bridge/br_stp_if.c
--- 2/net/bridge/br_stp_if.c
+++ b/net/bridge/br_stp_if.c
@@@ -37,10 -37,9 +37,10 @@@ static inline port_id br_make_port_id(_
  void br_init_port(struct net_bridge_port *p)
  {
        struct switchdev_attr attr = {
 +              .orig_dev = p->dev,
                .id = SWITCHDEV_ATTR_ID_BRIDGE_AGEING_TIME,
                .flags = SWITCHDEV_F_SKIP_EOPNOTSUPP | SWITCHDEV_F_DEFER,
-               .u.ageing_time = p->br->ageing_time,
+               .u.ageing_time = jiffies_to_clock_t(p->br->ageing_time),
        };
        int err;
  

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

diff --cc net/ipv6/addrconf.c
Simple merge

diff --cc net/openvswitch/conntrack.c
Simple merge

diff --cc net/sctp/socket.c
Simple merge