linux-kernel - Re: linux-next: manual merge of the omap tree with Linus' 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: <20091031153004.3544e6df.sfr@canb.auug.org.au>
Date:	Sat, 31 Oct 2009 15:30:04 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Tony Lindgren <tony@...mide.com>
Cc:	linux-omap@...r.kernel.org, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Janusz Krzysztofik <jkrzyszt@....icnet.pl>,
	Alexander Shishkin <virtuoso@...nd.org>,
	Ladislav Michl <ladis@...ux-mips.org>
Subject: Re: linux-next: manual merge of the omap tree with Linus' tree

Hi Tony,

On Fri, 30 Oct 2009 07:45:18 -0700 Tony Lindgren <tony@...mide.com> wrote:
>
> Thanks, will rebase omap for-next patches today.

Or you could just do a merge with Linus' tree (or the part of Linus' tree
that you clash with) ...

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

Content of type "application/pgp-signature" skipped