From: David S. Miller <davem@davemloft.net>
Date: Wed, 7 Aug 2019 01:44:57 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v5.4-rc1~131^2~285
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=13dfb3fa494361ea9a5950f27c9cd8b06d28c04f;p=users%2Fhch%2Fblock.git

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

Just minor overlapping changes in the conflicts here.

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

13dfb3fa494361ea9a5950f27c9cd8b06d28c04f
diff --cc Documentation/PCI/pci-error-recovery.rst
index 7e30f43a9659,e5d450df06b4..13beee23cb04
--- a/Documentation/PCI/pci-error-recovery.rst
+++ b/Documentation/PCI/pci-error-recovery.rst
@@@ -421,3 -421,7 +421,6 @@@ That is, the recovery API only require
     - drivers/net/ixgbe
     - drivers/net/cxgb3
     - drivers/net/s2io.c
 -   - drivers/net/qlge
+ 
+ The End
+ -------
diff --cc drivers/net/can/flexcan.c
index 09d8e623dcf6,fcec8bcb53d6..dc5695dffc2e
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@@ -1473,10 -1473,9 +1491,14 @@@ static int flexcan_setup_stop_mode(stru
  
  	device_set_wakeup_capable(&pdev->dev, true);
  
 +	if (of_property_read_bool(np, "wakeup-source"))
 +		device_set_wakeup_enable(&pdev->dev, true);
 +
 +	return 0;
++
+ out_put_node:
+ 	of_node_put(gpr_np);
+ 	return ret;
  }
  
  static const struct of_device_id flexcan_of_match[] = {
diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index c5d75e2ecf54,7ecfc53cf5f6..4d97cc47835f
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@@ -1338,20 -1248,16 +1338,20 @@@ void mlx5e_tc_update_neigh_used_value(s
  		return;
  
  	list_for_each_entry(e, &nhe->encap_list, encap_list) {
 -		struct encap_flow_item *efi;
 +		struct encap_flow_item *efi, *tmp;
  		if (!(e->flags & MLX5_ENCAP_ENTRY_VALID))
  			continue;
 -		list_for_each_entry(efi, &e->flows, list) {
 +		list_for_each_entry_safe(efi, tmp, &e->flows, list) {
  			flow = container_of(efi, struct mlx5e_tc_flow,
  					    encaps[efi->index]);
 -			if (flow->flags & MLX5E_TC_FLOW_OFFLOADED) {
 +			if (IS_ERR(mlx5e_flow_get(flow)))
 +				continue;
 +
 +			if (mlx5e_is_offloaded_flow(flow)) {
  				counter = mlx5e_tc_get_counter(flow);
- 				mlx5_fc_query_cached(counter, &bytes, &packets, &lastuse);
+ 				lastuse = mlx5_fc_query_lastuse(counter);
  				if (time_after((unsigned long)lastuse, nhe->reported_lastuse)) {
 +					mlx5e_flow_put(netdev_priv(e->out_dev), flow);
  					neigh_used = true;
  					break;
  				}