Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 7 Jun 2019 18:00:14 +0000 (11:00 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 7 Jun 2019 18:00:14 +0000 (11:00 -0700)
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>
113 files changed:
1  2 
MAINTAINERS
drivers/i2c/i2c-core-acpi.c
drivers/isdn/hardware/mISDN/netjet.c
drivers/media/dvb-frontends/tua6100.c
drivers/net/dsa/mv88e6xxx/chip.c
drivers/net/dsa/mv88e6xxx/chip.h
drivers/net/dsa/mv88e6xxx/global1.c
drivers/net/dsa/mv88e6xxx/global1.h
drivers/net/dsa/mv88e6xxx/global1_atu.c
drivers/net/dsa/mv88e6xxx/global1_vtu.c
drivers/net/dsa/mv88e6xxx/global2.c
drivers/net/dsa/mv88e6xxx/global2.h
drivers/net/dsa/mv88e6xxx/port.c
drivers/net/dsa/mv88e6xxx/port.h
drivers/net/dsa/mv88e6xxx/smi.c
drivers/net/dsa/sja1105/sja1105_main.c
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
drivers/net/ethernet/mediatek/mtk_eth_soc.c
drivers/net/ethernet/rocker/rocker_main.c
drivers/net/ethernet/rocker/rocker_ofdpa.c
drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
drivers/net/macvlan.c
drivers/net/phy/phylink.c
drivers/net/phy/sfp.c
drivers/net/plip/plip.c
drivers/net/wan/hdlc_cisco.c
drivers/staging/isdn/gigaset/asyncdata.c
drivers/staging/isdn/gigaset/bas-gigaset.c
drivers/staging/isdn/gigaset/capi.c
drivers/staging/isdn/gigaset/common.c
drivers/staging/isdn/gigaset/dummyll.c
drivers/staging/isdn/gigaset/ev-layer.c
drivers/staging/isdn/gigaset/gigaset.h
drivers/staging/isdn/gigaset/interface.c
drivers/staging/isdn/gigaset/isocdata.c
drivers/staging/isdn/gigaset/proc.c
drivers/staging/isdn/gigaset/ser-gigaset.c
drivers/staging/isdn/gigaset/usb-gigaset.c
fs/afs/cmservice.c
fs/afs/internal.h
include/dt-bindings/net/ti-dp83867.h
include/linux/bpf.h
include/linux/bpf_verifier.h
include/linux/igmp.h
include/linux/phy.h
include/linux/skbuff.h
include/net/devlink.h
include/net/dsa.h
include/net/ip.h
include/net/ip6_fib.h
include/net/ip_fib.h
include/net/ipv6.h
include/net/tcp.h
include/net/tls.h
kernel/bpf/core.c
kernel/bpf/stackmap.c
kernel/cgroup/cgroup.c
net/8021q/vlan_dev.c
net/bridge/br_device.c
net/bridge/br_private.h
net/core/devlink.c
net/core/filter.c
net/core/neighbour.c
net/core/pktgen.c
net/core/skbuff.c
net/dsa/dsa2.c
net/dsa/dsa_priv.h
net/dsa/port.c
net/dsa/slave.c
net/ethernet/eth.c
net/ieee802154/6lowpan/reassembly.c
net/ipv4/devinet.c
net/ipv4/fib_frontend.c
net/ipv4/fib_rules.c
net/ipv4/fib_semantics.c
net/ipv4/fib_trie.c
net/ipv4/icmp.c
net/ipv4/igmp.c
net/ipv4/inet_connection_sock.c
net/ipv4/inet_fragment.c
net/ipv4/inet_hashtables.c
net/ipv4/proc.c
net/ipv4/route.c
net/ipv4/tcp.c
net/ipv4/tcp_ipv4.c
net/ipv4/udp.c
net/ipv4/udp_offload.c
net/ipv6/addrconf.c
net/ipv6/af_inet6.c
net/ipv6/icmp.c
net/ipv6/inet6_hashtables.c
net/ipv6/ip6_fib.c
net/ipv6/ip6_output.c
net/ipv6/ndisc.c
net/ipv6/netfilter/nf_conntrack_reasm.c
net/ipv6/proc.c
net/ipv6/reassembly.c
net/ipv6/route.c
net/ipv6/tcp_ipv6.c
net/ipv6/udp.c
net/netfilter/ipvs/ip_vs_app.c
net/netfilter/ipvs/ip_vs_core.c
net/netfilter/ipvs/ip_vs_ctl.c
net/netfilter/ipvs/ip_vs_ftp.c
net/netfilter/ipvs/ip_vs_proto_tcp.c
net/netfilter/ipvs/ip_vs_proto_udp.c
net/netfilter/ipvs/ip_vs_xmit.c
net/netfilter/nf_conntrack_broadcast.c
net/rds/ib.c
net/sctp/offload.c
net/socket.c
net/tls/tls_device.c
tools/testing/selftests/bpf/test_verifier.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index f5b97dab3017612229bd129319179f241989f0e4,4c0616ba314d37048baba87bfdec125d9abd1114..5d0af041b8f9f662d957d19353b05a8cb4bf4157
@@@ -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;
        }
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index d1a4f365d6bec3296794f9a3f66f15657c4834c7,4a55ce6a303f54ed5bfd79678093aee552eb186f..3ecf45adb707cb88acad19fb471cd945600d8403
@@@ -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;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/dsa/dsa2.c
Simple merge
Simple merge
diff --cc net/dsa/port.c
Simple merge
diff --cc net/dsa/slave.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/ipv4/icmp.c
Simple merge
diff --cc net/ipv4/igmp.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/ipv4/proc.c
Simple merge
Simple merge
diff --cc net/ipv4/tcp.c
Simple merge
Simple merge
diff --cc net/ipv4/udp.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/ipv6/icmp.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/ipv6/proc.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/ipv6/udp.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/rds/ib.c
Simple merge
Simple merge
diff --cc net/socket.c
Simple merge
Simple merge