netdev - Re: [net-next] e1000e: Fix merge conflict (net->net-next)

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: <20120509.120710.476288988412846674.davem@davemloft.net>
Date:	Wed, 09 May 2012 12:07:10 -0400 (EDT)
From:	David Miller <davem@...emloft.net>
To:	jeffrey.t.kirsher@...el.com
Cc:	netdev@...r.kernel.org, gospo@...hat.com, sassmann@...hat.com
Subject: Re: [net-next] e1000e: Fix merge conflict (net->net-next)

From: Jeff Kirsher <jeffrey.t.kirsher@...el.com>
Date: Wed,  9 May 2012 02:23:46 -0700

> During merge of net to net-next the changes in patch:
> 
> e1000e: Fix default interrupt throttle rate not set in NIC HW
> 
> got munged in param.c of the e1000e driver.  This rectifies the
> merge issues.
> 
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@...el.com>

Applied, thanks Jeff.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html