netdev - Re: linux-next: manual merge of the trivial tree with the net-current 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]

Date:	Thu, 10 Dec 2009 14:41:02 -0800 (PST)
From:	David Miller <davem@...emloft.net>
To:	sfr@...b.auug.org.au
Cc:	jkosina@...e.cz, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, damian@....rwth-aachen.de,
	netdev@...r.kernel.org, andre.goddard@...il.com
Subject: Re: linux-next: manual merge of the trivial tree with the
 net-current tree

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Thu, 10 Dec 2009 22:14:06 +1100

> Hi Jiri,
> 
> On Thu, 10 Dec 2009 09:45:27 +0100 (CET) Jiri Kosina <jkosina@...e.cz> wrote:
>>
>> Linus has merged trivial tree into his tree tonight, so I am afraid that 
>> davem will have to fix the conflict when pulling Linus tree into 
>> net-current.
> 
> Yep, or Linus can fix it if he feels inclined.

Nah, I'll do a pull into net-2.6 to resolve the conflict first.
--
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