linux-kernel - Re: linux-next: manual merge of the moduleh tree with the arm 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: <20110826091150.58697ca3adc9ba6dfcb357e0@canb.auug.org.au>
Date:	Fri, 26 Aug 2011 09:11:50 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Paul Gortmaker <paul.gortmaker@...driver.com>
Cc:	Russell King <rmk@....linux.org.uk>, <linux-next@...r.kernel.org>,
	<linux-kernel@...r.kernel.org>, Jon Medhurst <tixy@...t.co.uk>
Subject: Re: linux-next: manual merge of the moduleh tree with the arm tree

Hi Paul,

On Thu, 25 Aug 2011 18:40:54 -0400 Paul Gortmaker <paul.gortmaker@...driver.com> wrote:
>
> OK.  I was entertaining feeding some of the really obvious and simple
> parts of the moduleh branch out to the various maintainers just to
> reduce its overall size, but in the end I guess that just makes work
> for me and them -- vs. a single pull request to Linus for addition to
> v3.2-rc1.   I'll just stay the course and Stephen will have to rerere
> the merge conflict resolution for a while -- something I'm certain
> that he has automated long long ago.

Yeah, that's fine.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped