Re: linux-next: manual merge of the net-next tree with the net tree

[Stephen Rothwell]

Hi Dave,

On Mon, 09 Mar 2015 23:43:29 -0400 (EDT) David Miller <davem@xxxxxxxxxxxxx> wrote:
>
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Tue, 10 Mar 2015 12:08:42 +1100
> 
> > Today's linux-next merge of the net-next tree got a conflict in
> > drivers/net/ethernet/cadence/macb.c between commit 0b2eb3e9bc73 ("net:
> > macb: constify macb configuration data") from the net tree and commits
> > a848748959d5 ("net: macb: remove #if defined(CONFIG_ARCH_AT91)
> > sections") and 421d9df0628b ("net/macb: merge at91_ether driver into
> > macb driver") from the net-next tree.
> > 
> > I fixed it up (I think - see below) and can carry the fix as necessary
> > (no action is required).
> 
> Thanks Stephen, I'm merging net into net-next right now and will resolve
> this similarly.

Just wondering if you got that merge right?  Here is the diff from what
I did yesterday to what you have in net-next:

diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index f032e2a245b0..f00be585f661 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -2131,24 +2131,8 @@ static const struct net_device_ops macb_netdev_ops = {
  */
 static void macb_configure_caps(struct macb *bp)
 {
-	const struct of_device_id *match;
-	const struct macb_config *config;
 	u32 dcfg;
 
-	if (bp->pdev->dev.of_node) {
-		match = of_match_node(macb_dt_ids, bp->pdev->dev.of_node);
-		if (match && match->data) {
-			config = match->data;
-
-			bp->caps = config->caps;
-			/*
-			 * As we have access to the matching node, configure
-			 * DMA burst length as well
-			 */
-			bp->dma_burst_length = config->dma_burst_length;
-		}
-	}
-
 	if (MACB_BFEXT(IDNUM, macb_readl(bp, MID)) == 0x2)
 		bp->caps |= MACB_CAPS_MACB_IS_GEM;
 
That section was removed by commit 421d9df0628b ("net/macb: merge
at91_ether driver into macb driver") and I presumed its effect was
moved into macb_probe().

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgppBANiuAkN5.pgp
Description: OpenPGP digital signature