netdev - Re: linux-next: manual merge of the trivial tree with the net 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: <20100205.085516.66180257.davem@davemloft.net>
Date:	Fri, 05 Feb 2010 08:55:16 -0800 (PST)
From:	David Miller <davem@...emloft.net>
To:	jkosina@...e.cz
Cc:	sfr@...b.auug.org.au, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, adam.buchbinder@...il.com,
	netdev@...r.kernel.org, bhutchings@...arflare.com
Subject: Re: linux-next: manual merge of the trivial tree with the net tree

From: Jiri Kosina <jkosina@...e.cz>
Date: Fri, 5 Feb 2010 12:23:06 +0100 (CET)

> Ayway, below is the hunk that I have already dropped from my tree (so that 
> conflict in linux-next is gone), please feel free to apply it to your 
> tree, and let me known whether you want me to reject all furutre patches 

I can't apply it to my tree, that's why we had the conflict
in the first place.

Please submit this to me so that it applies cleanly to net-next-2.6

Thanks.
--
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