linux-kernel - Re: [PATCH] linux-next: et131x: Fixups due to merge issues from staging tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CANK3SE1w5n+t7+pwn6FLLu0py=-z2D=MSpWkg8ePKMdc2DfmrA@mail.gmail.com>
Date:	Tue, 31 Jan 2012 19:09:31 +0000
From:	Mark Einon <mark.einon@...il.com>
To:	Greg KH <greg@...ah.com>
Cc:	20111025192636.f816c8860ee168a0a4756eda@...b.auug.org.au,
	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jiri Pirko <jpirko@...hat.com>,
	Ian Campbell <Ian.Campbell@...rix.com>,
	David Miller <davem@...emloft.net>, netdev@...r.kernel.org
Subject: Re: [PATCH] linux-next: et131x: Fixups due to merge issues from
 staging tree

On 31 January 2012 18:26, Greg KH <greg@...ah.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/