linux-next: manual merge of the net-next tree with Linus' tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1938 bytes --]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c between commit
64c3b252e9fc ("net: stmmac: fixed the pbl setting with DT") from the
tree and commit e2a240c7d3bc ("driver:net:stmmac: Disable DMA store and
forward mode if platform data force_thresh_dma_mode is set") from the
net-next tree.

I fixed it up (I think - see below) and can carry the fix as necessary (no
action is required).


-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 1c83a44,623ebc5..0000000
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@@ -71,18 -71,19 +71,23 @@@ static int stmmac_probe_config_dt(struc
  		plat->force_sf_dma_mode = 1;
  	}
  
 -	dma_cfg = devm_kzalloc(&pdev->dev, sizeof(*dma_cfg), GFP_KERNEL);
 -	if (!dma_cfg)
 -		return -ENOMEM;
 -
 -	plat->dma_cfg = dma_cfg;
 -	of_property_read_u32(np, "snps,pbl", &dma_cfg->pbl);
 -	dma_cfg->fixed_burst = of_property_read_bool(np, "snps,fixed-burst");
 -	dma_cfg->mixed_burst = of_property_read_bool(np, "snps,mixed-burst");
 +	if (of_find_property(np, "snps,pbl", NULL)) {
 +		dma_cfg = devm_kzalloc(&pdev->dev, sizeof(*dma_cfg),
 +				       GFP_KERNEL);
 +		if (!dma_cfg)
 +			return -ENOMEM;
 +		plat->dma_cfg = dma_cfg;
 +		of_property_read_u32(np, "snps,pbl", &dma_cfg->pbl);
 +		dma_cfg->fixed_burst =
 +			of_property_read_bool(np, "snps,fixed-burst");
 +		dma_cfg->mixed_burst =
 +			of_property_read_bool(np, "snps,mixed-burst");
 +	}
+ 	plat->force_thresh_dma_mode = of_property_read_bool(np, "snps,force_thresh_dma_mode");
+ 	if (plat->force_thresh_dma_mode) {
+ 		plat->force_sf_dma_mode = 0;
+ 		pr_warn("force_sf_dma_mode is ignored if force_thresh_dma_mode is set.");
+ 	}
  
  	return 0;
  }

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]