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  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]
Date:	Sat, 4 Jan 2014 22:43:46 +1100
From:	Stephen Rothwell <>
To:	Olof Johansson <>
Cc:	Nicolas Ferre <>,
	Simon Horman <>,
	Arnd Bergmann <>,
	"" <>,
	"" <>,
	Boris BREZILLON <>,
	Laurent Pinchart <>,
	Mike Turquette <>
Subject: Re: linux-next: manual merge of the renesas tree with the arm-soc

Hi Olof,

On Fri, 3 Jan 2014 21:11:29 -0800 Olof Johansson <> wrote:
> Now I can't resolve it properly and move the entries when I do the
> same merge (and get the same conflict), because that will cause a
> third conflict for Stephen, and he's about to return from vacation and
> is going to cuss at us if we cause too many new conflicts in one day.
> :)

Since I have now been made aware of the issue, you might as well just
sort it in the merge.  And I have never been known to "cuss", though
ranting is a possibility :-)

Stephen Rothwell          

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists