linux-kernel - Re: linux-next: manual merge of the 4xx tree with the powerpc 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: <20111209125116.f8a5d071c3e86d26c7f8660e@canb.auug.org.au>
Date:	Fri, 9 Dec 2011 12:51:16 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Josh Boyer <jwboyer@...il.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Benjamin Herrenschmidt <benh@...nel.crashing.org>,
	Paul Mackerras <paulus@...ba.org>,
	linuxppc-dev@...ts.ozlabs.org, Tanmay Inamdar <tinamdar@....com>
Subject: Re: linux-next: manual merge of the 4xx tree with the powerpc tree

Hi Josh,

On Thu, 8 Dec 2011 20:46:39 -0500 Josh Boyer <jwboyer@...il.com> wrote:
>
> I blame BenH.  I sent him a pull request with d5b9ee7b514e in it
> before he went and updated his tree.  Still not pulled afaik.  Guess
> I'll be rebasing my next branch tomorrow to pick up a series from Tony
> Breeds, unless Ben handles the outstanding pull before I wake up :).

Don't bother rebasing, let Ben handle the conflict in the merge.

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

Content of type "application/pgp-signature" skipped