Messages in this thread | | | Date | Tue, 10 Mar 2015 18:34:32 -0400 (EDT) | Subject | Re: linux-next: manual merge of the net-next tree with the net tree | From | David Miller <> |
| |
From: Stephen Rothwell <sfr@canb.auug.org.au> 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!
| |