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

Minor conflict in drivers/s390/net/qeth_l2_main.c, kept the lock
from commit c8183f548902 ("s390/qeth: fix potential deadlock on
workqueue flush"), removed the code which was removed by commit
9897d583b015 ("s390/qeth: consolidate some duplicated HW cmd code").

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/freescale/fec_main.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
Simple merge

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

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
Simple merge

diff --cc drivers/net/ethernet/realtek/r8169_main.c
Simple merge

diff --cc drivers/net/hyperv/hyperv_net.h
Simple merge

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

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

diff --cc drivers/s390/net/qeth_core.h
Simple merge

diff --cc drivers/s390/net/qeth_core_main.c
Simple merge

diff --cc drivers/s390/net/qeth_l2_main.c
index ae69c981650d5aa66c0278205886962944ac3407,4bccdce19b5adb062901cba7dab138556573e13c..989935d67b313da0a3e6fd24f529d1a794f08d10
--- 1/drivers/s390/net/qeth_l2_main.c
--- 2/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@@ -779,6 -802,14 +784,7 @@@ static int qeth_l2_set_online(struct cc
                goto out_remove;
        }
  
 -      if (qeth_is_diagass_supported(card, QETH_DIAGS_CMD_TRAP)) {
 -              if (card->info.hwtrap &&
 -                  qeth_hw_trap(card, QETH_DIAGS_TRAP_ARM))
 -                      card->info.hwtrap = 0;
 -      } else
 -              card->info.hwtrap = 0;
 -
+       mutex_lock(&card->sbp_lock);
        qeth_bridgeport_query_support(card);
        if (card->options.sbp.supported_funcs)
                dev_info(&card->gdev->dev,

diff --cc drivers/s390/net/qeth_l2_sys.c
Simple merge

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

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

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

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

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

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

diff --cc net/sched/act_pedit.c
index d5eff6ac17a91d25e90d8a38d4cabe64fe060591,b5bc631b96b7e1b164bf8e6946d32a719456e23d..3ad7185763046e69a6a6d8ea8694ae4371788b9d
--- 1/net/sched/act_pedit.c
--- 2/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c
@@@ -184,14 -187,8 +188,8 @@@ static int tcf_pedit_init(struct net *n
        index = parm->index;
        err = tcf_idr_check_alloc(tn, &index, a, bind);
        if (!err) {
-               if (!parm->nkeys) {
-                       tcf_idr_cleanup(tn, index);
-                       NL_SET_ERR_MSG_MOD(extack, "Pedit requires keys to be passed");
-                       ret = -EINVAL;
-                       goto out_free;
-               }
                ret = tcf_idr_create(tn, index, est, a,
 -                                   &act_pedit_ops, bind, false);
 +                                   &act_pedit_ops, bind, false, 0);
                if (ret) {
                        tcf_idr_cleanup(tn, index);
                        goto out_free;

diff --cc net/sched/act_tunnel_key.c
Simple merge

diff --cc net/tls/tls_main.c
index 5bb93dd5762b472d4a8bcee0e5c560eae16b7ffa,f874cc0da45df2f0269190c68ec2dfc3978fb833..bdca31ffe6da7c7102c29f1f98193c6077ecb5e0
--- 1/net/tls/tls_main.c
--- 2/net/tls/tls_main.c
+++ b/net/tls/tls_main.c
@@@ -853,14 -906,9 +853,15 @@@ static struct tcp_ulp_ops tcp_tls_ulp_o
  
  static int __init tls_register(void)
  {
 +      int err;
 +
 +      err = register_pernet_subsys(&tls_proc_ops);
 +      if (err)
 +              return err;
 +
        tls_sw_proto_ops = inet_stream_ops;
        tls_sw_proto_ops.splice_read = tls_sw_splice_read;
+       tls_sw_proto_ops.sendpage_locked   = tls_sw_sendpage_locked,
  
        tls_device_init();
        tcp_register_ulp(&tcp_tls_ulp_ops);

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