linux-kernel - Re: [PATCH net-next] r8169: fix merge conflict fix.

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: <20110427.135240.112610984.davem@davemloft.net>
Date:	Wed, 27 Apr 2011 13:52:40 -0700 (PDT)
From:	David Miller <davem@...emloft.net>
To:	romieu@...zoreil.com
Cc:	sfr@...b.auug.org.au, netdev@...r.kernel.org,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	nic_swsd@...ltek.com
Subject: Re: [PATCH net-next] r8169: fix merge conflict fix.

From: Francois Romieu <romieu@...zoreil.com>
Date: Wed, 27 Apr 2011 22:36:40 +0200

> - use adequate MAC_VER id
>   (see 01dc7fec4025f6bb72b6b98ec88b375346b6dbbb)
> - remove duplicate rtl_firmware_info record
> - remove duplicate functions
> 
> Signed-off-by: Francois Romieu <romieu@...zoreil.com>
> Cc: Realtek linux nic maintainers <nic_swsd@...ltek.com>

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