lkml.org 
[lkml]   [2015]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: linux-next: manual merge of the net-next tree with the net tree
From
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!


\
 
 \ /
  Last update: 2015-03-10 23:41    [W:0.036 / U:0.564 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site