From: David S. Miller <davem@davemloft.net>
Date: Tue, 9 Jan 2018 15:37:00 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v4.19~1702^2~211
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a0ce093180f2bbb832b3f5583adc640ad67ea568;p=platform%2Fkernel%2Flinux-rpi.git

Merge git://git./linux/kernel/git/davem/net
---

a0ce093180f2bbb832b3f5583adc640ad67ea568
diff --cc drivers/net/can/flexcan.c
index 3cd371c,760d2c0..634c51e
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@@ -541,11 -524,11 +541,11 @@@ static int flexcan_start_xmit(struct sk
  
  	if (cf->can_dlc > 0) {
  		data = be32_to_cpup((__be32 *)&cf->data[0]);
 -		flexcan_write(data, &priv->tx_mb->data[0]);
 +		priv->write(data, &priv->tx_mb->data[0]);
  	}
- 	if (cf->can_dlc > 3) {
+ 	if (cf->can_dlc > 4) {
  		data = be32_to_cpup((__be32 *)&cf->data[4]);
 -		flexcan_write(data, &priv->tx_mb->data[1]);
 +		priv->write(data, &priv->tx_mb->data[1]);
  	}
  
  	can_put_echo_skb(skb, dev, 0);
diff --cc drivers/net/phy/phylink.c
index d1f9466,249ce5c..6ac8b29
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@@ -1656,12 -1428,11 +1658,11 @@@ static void phylink_sfp_link_down(void 
  {
  	struct phylink *pl = upstream;
  
 -	WARN_ON(!lockdep_rtnl_is_held());
 +	ASSERT_RTNL();
  
  	set_bit(PHYLINK_DISABLE_LINK, &pl->phylink_disable_state);
+ 	queue_work(system_power_efficient_wq, &pl->resolve);
  	flush_work(&pl->resolve);
- 
- 	netif_carrier_off(pl->netdev);
  }
  
  static void phylink_sfp_link_up(void *upstream)
diff --cc include/linux/bpf.h
index 9e03046,b63a592..6be837c
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@@ -529,10 -522,10 +537,12 @@@ static inline struct bpf_prog *bpf_prog
  	return bpf_prog_get_type_dev(ufd, type, false);
  }
  
+ bool bpf_prog_get_ok(struct bpf_prog *, enum bpf_prog_type *, bool);
+ 
  int bpf_prog_offload_compile(struct bpf_prog *prog);
  void bpf_prog_offload_destroy(struct bpf_prog *prog);
 +int bpf_prog_offload_info_fill(struct bpf_prog_info *info,
 +			       struct bpf_prog *prog);
  
  #if defined(CONFIG_NET) && defined(CONFIG_BPF_SYSCALL)
  int bpf_prog_offload_init(struct bpf_prog *prog, union bpf_attr *attr);