linux-kernel - Re: linux-next: manual merge of the arm tree with the arm-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]

Message-Id: <20100118143429.7ef34dde.sfr@canb.auug.org.au>
Date:	Mon, 18 Jan 2010 14:34:29 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Ben Dooks <ben-linux@...ff.org>
Cc:	Russell King <rmk@....linux.org.uk>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Kukjin Kim <kgene.kim@...sung.com>
Subject: Re: linux-next: manual merge of the arm tree with the arm-current
 tree

Hi Ben,

On Mon, 18 Jan 2010 01:33:07 +0000 Ben Dooks <ben-linux@...ff.org> wrote:
>
> Is that from the merge of next-samsung or from two parts of the ARM
> trees?

I merged the arm-current tree
(ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master) into
linux-next and then later the arm tree
(ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#devel) and the second
merge produced this conflict.  However, Russell has merged the samsung
tree (git://git.fluff.org/bjdooks/linux.git#next-samsung) into the arm
tree, already.

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

Content of type "application/pgp-signature" skipped