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

Some ISDN files that got removed in net-next had some changes
done in mainline, take the removals.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/i2c/i2c-core-acpi.c
Simple merge

diff --cc drivers/isdn/hardware/mISDN/netjet.c
Simple merge

diff --cc drivers/media/dvb-frontends/tua6100.c
Simple merge

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

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

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

diff --cc drivers/net/dsa/mv88e6xxx/global1.h
Simple merge

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

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

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

diff --cc drivers/net/dsa/mv88e6xxx/global2.h
Simple merge

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

diff --cc drivers/net/dsa/mv88e6xxx/port.h
Simple merge

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

diff --cc drivers/net/dsa/sja1105/sja1105_main.c
Simple merge

diff --cc drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
Simple merge

diff --cc drivers/net/ethernet/mediatek/mtk_eth_soc.c
Simple merge

diff --cc drivers/net/ethernet/rocker/rocker_main.c
Simple merge

diff --cc drivers/net/ethernet/rocker/rocker_ofdpa.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
Simple merge

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

diff --cc drivers/net/phy/phylink.c
index f5b97da,4c0616b..5d0af04
--- 1/drivers/net/phy/phylink.c
--- 2/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@@ -1695,21 -1606,23 +1698,23 @@@ static int phylink_sfp_module_insert(vo
                return ret;
        }
  
+       linkmode_copy(support1, support);
+ 
        iface = sfp_select_interface(pl->sfp_bus, id, config.advertising);
        if (iface == PHY_INTERFACE_MODE_NA) {
 -              netdev_err(pl->netdev,
 -                         "selection of interface failed, advertisement %*pb\n",
 -                         __ETHTOOL_LINK_MODE_MASK_NBITS, config.advertising);
 +              phylink_err(pl,
 +                          "selection of interface failed, advertisement %*pb\n",
 +                          __ETHTOOL_LINK_MODE_MASK_NBITS, config.advertising);
                return -EINVAL;
        }
  
        config.interface = iface;
-       ret = phylink_validate(pl, support, &config);
+       ret = phylink_validate(pl, support1, &config);
        if (ret) {
 -              netdev_err(pl->netdev, "validation of %s/%s with support %*pb failed: %d\n",
 -                         phylink_an_mode_str(MLO_AN_INBAND),
 -                         phy_modes(config.interface),
 -                         __ETHTOOL_LINK_MODE_MASK_NBITS, support, ret);
 +              phylink_err(pl, "validation of %s/%s with support %*pb failed: %d\n",
 +                          phylink_an_mode_str(MLO_AN_INBAND),
 +                          phy_modes(config.interface),
 +                          __ETHTOOL_LINK_MODE_MASK_NBITS, support, ret);
                return ret;
        }
  

diff --cc drivers/net/phy/sfp.c
Simple merge

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

diff --cc drivers/net/wan/hdlc_cisco.c
Simple merge

diff --cc drivers/staging/isdn/gigaset/asyncdata.c
Simple merge

diff --cc drivers/staging/isdn/gigaset/bas-gigaset.c
Simple merge

diff --cc drivers/staging/isdn/gigaset/capi.c
Simple merge

diff --cc drivers/staging/isdn/gigaset/common.c
Simple merge

diff --cc drivers/staging/isdn/gigaset/dummyll.c
Simple merge

diff --cc drivers/staging/isdn/gigaset/ev-layer.c
Simple merge

diff --cc drivers/staging/isdn/gigaset/gigaset.h
Simple merge

diff --cc drivers/staging/isdn/gigaset/interface.c
Simple merge

diff --cc drivers/staging/isdn/gigaset/isocdata.c
Simple merge

diff --cc drivers/staging/isdn/gigaset/proc.c
Simple merge

diff --cc drivers/staging/isdn/gigaset/ser-gigaset.c
Simple merge

diff --cc drivers/staging/isdn/gigaset/usb-gigaset.c
Simple merge

diff --cc fs/afs/cmservice.c
Simple merge

diff --cc fs/afs/internal.h
Simple merge

diff --cc include/dt-bindings/net/ti-dp83867.h
Simple merge

diff --cc include/linux/bpf.h
Simple merge

diff --cc include/linux/bpf_verifier.h
Simple merge

diff --cc include/linux/igmp.h
Simple merge

diff --cc include/linux/phy.h
Simple merge

diff --cc include/linux/skbuff.h
Simple merge

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

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

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

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

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

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

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

diff --cc include/net/tls.h
index d1a4f36,4a55ce6..3ecf45a
--- 1/include/net/tls.h
--- 2/include/net/tls.h
+++ b/include/net/tls.h
@@@ -207,8 -206,13 +207,12 @@@ struct tls_offload_context_tx 
  };
  
  #define TLS_OFFLOAD_CONTEXT_SIZE_TX                                            \
 -      (ALIGN(sizeof(struct tls_offload_context_tx), sizeof(void *)) +        \
 -       TLS_DRIVER_STATE_SIZE)
 +      (sizeof(struct tls_offload_context_tx) + TLS_DRIVER_STATE_SIZE_TX)
  
+ enum tls_context_flags {
+       TLS_RX_SYNC_RUNNING = 0,
+ };
+ 
  struct cipher_context {
        char *iv;
        char *rec_seq;

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

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

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

diff --cc net/8021q/vlan_dev.c
Simple merge

diff --cc net/bridge/br_device.c
Simple merge

diff --cc net/bridge/br_private.h
Simple merge

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

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

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

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

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

diff --cc net/dsa/dsa2.c
Simple merge

diff --cc net/dsa/dsa_priv.h
Simple merge

diff --cc net/dsa/port.c
Simple merge

diff --cc net/dsa/slave.c
Simple merge

diff --cc net/ethernet/eth.c
Simple merge

diff --cc net/ieee802154/6lowpan/reassembly.c
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc net/ipv6/netfilter/nf_conntrack_reasm.c
Simple merge

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

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

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

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

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

diff --cc net/netfilter/ipvs/ip_vs_app.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_core.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_ctl.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_ftp.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_proto_tcp.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_proto_udp.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_xmit.c
Simple merge

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

diff --cc net/rds/ib.c
Simple merge

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

diff --cc net/socket.c
Simple merge

diff --cc net/tls/tls_device.c
Simple merge

diff --cc tools/testing/selftests/bpf/test_verifier.c
Simple merge