linux-kernel - 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] [thread-next>] [day] [month] [year] [list]

Message-Id: <20091210221406.94b1aaaf.sfr@canb.auug.org.au>
Date:	Thu, 10 Dec 2009 22:14:06 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Kosina <jkosina@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Damian Lukowski <damian@....rwth-aachen.de>,
	David Miller <davem@...emloft.net>, netdev@...r.kernel.org,
	"André Goddard Rosa" <andre.goddard@...il.com>
Subject: Re: linux-next: manual merge of the trivial tree with the
 net-current tree

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.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped