lkml.org 
[lkml]   [2012]   [Jan]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH] linux-next: et131x: Fixups due to merge issues from staging tree
On 31 January 2012 18:26, Greg KH <greg@kroah.com> wrote:
> On Tue, Oct 25, 2011 at 01:15:52PM +0100, Mark Einon wrote:
>>
>> Manually merged changes from commits afc4b13df143, bf3f1a6081aa and 5d6bcdfe38ce into et131x.c as identified in email below.
>>
>> Also removed dependency on NETDEV_1000 in Kconfig, which no longer exists.
>>
>> Greg: This patch should also be good for the staging tree.
>
> I don't think this is needed anymore, right?

Hi Greg,

Correct, this change is in staging-next and does not need to be applied.
It's since been added by a merge from Linus's tree.

Cheers,

Mark

>
> If so, please redo it against Linus's tree and send it to me.
>
> thanks,
>
> greg k-h


\
 
 \ /
  Last update: 2012-01-31 20:11    [W:0.043 / U:0.684 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site