From: Jakub Kicinski <jakub.kicinski@netronome.com>
Date: Sat, 23 Nov 2019 00:27:24 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a9f852e92e40992c4ff09ac3940f7725e016317a;p=linux.git

Merge git://git./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>
---

a9f852e92e40992c4ff09ac3940f7725e016317a
diff --cc drivers/s390/net/qeth_l2_main.c
index ae69c981650d5,4bccdce19b5ad..989935d67b313
--- a/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 net/sched/act_pedit.c
index d5eff6ac17a91,b5bc631b96b7e..3ad7185763046
--- a/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/tls/tls_main.c
index 5bb93dd5762b4,f874cc0da45df..bdca31ffe6da7
--- a/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);