Re: linux-next: manual merge of the net-next tree with the net tree
From: David Miller
Date: Tue Mar 10 2015 - 18:34:43 EST
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed, 11 Mar 2015 08:48:30 +1100
> Just wondering if you got that merge right? Here is the diff from what
> I did yesterday to what you have in net-next:
> 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().
Indeed, you're right, good catch.
Fixed and pushed out to net-next, thanks!
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/