netdev - Re: [next-next PATCH] e1000e: fixup merge error

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: <20090320.155644.86516049.davem@davemloft.net>
Date:	Fri, 20 Mar 2009 15:56:44 -0700 (PDT)
From:	David Miller <davem@...emloft.net>
To:	ajones@...erbed.com
Cc:	jeffrey.t.kirsher@...el.com, netdev@...r.kernel.org,
	gospo@...hat.com, Arthur.Jones@...erbed.com, shemminger@...tta.com,
	alexander.h.duyck@...el.com
Subject: Re: [next-next PATCH] e1000e: fixup merge error

From: Arthur Jones <ajones@...erbed.com>
Date: Fri, 20 Mar 2009 08:24:47 -0700

> When merging into Jeff's tree:
> 
> 	commit 5f66f208064f083aab5e55935d0575892e033b59
> 	Author: Arthur Jones <ajones@...erbed.com>
> 	Date:   Thu Mar 19 01:13:08 2009 +0000
> 
> 	    e1000e: allow tx of pre-formatted vlan tagged packets
> 
> We lost one line, this fixes that missing
> piece...
> 
> Signed-off-by: Arthur Jones <ajones@...erbed.com>

Applied, thanks Arthur.
--
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