Re: linux-next: manual merge of the random tree with the net-next tree

2013-11-14 Thread Markos Chandras
On 11/12/2013 08:46 PM, Stephen Rothwell wrote: Hi Daniel, On Tue, 12 Nov 2013 09:55:29 +0100 Daniel Borkmann wrote: On 11/12/2013 05:55 AM, Stephen Rothwell wrote: Today's linux-next merge of the random tree got a conflict in drivers/char/random.c between commit 0244ad004a54 ("random32: ad

Re: linux-next: manual merge of the random tree with the net-next tree

2013-11-12 Thread Theodore Ts'o
On Tue, Nov 12, 2013 at 06:17:17PM -0500, David Miller wrote: > > Agreed. What's the schedule for pushing net-dev to Linus? I'm > > currently at Korea Linux Forum, and I was originally planning on > > pushing random.git to Linus sometime today, but I'm also willing to > > wait for net-dev to go f

Re: linux-next: manual merge of the random tree with the net-next tree

2013-11-12 Thread David Miller
From: Theodore Ts'o Date: Tue, 12 Nov 2013 18:02:42 -0500 > On Tue, Nov 12, 2013 at 09:55:29AM +0100, Daniel Borkmann wrote: >> >> As per Hannes' suggestion, the result should look like (see cover >> letter in [1]): >> >> if (r->entropy_total > 128) { >> r->initialized = 1; >> r->entr

Re: linux-next: manual merge of the random tree with the net-next tree

2013-11-12 Thread Hannes Frederic Sowa
On Tue, Nov 12, 2013 at 06:02:42PM -0500, Theodore Ts'o wrote: > On Tue, Nov 12, 2013 at 09:55:29AM +0100, Daniel Borkmann wrote: > > > > As per Hannes' suggestion, the result should look like (see cover > > letter in [1]): > > > > if (r->entropy_total > 128) { > > r->initialized = 1; > >

Re: linux-next: manual merge of the random tree with the net-next tree

2013-11-12 Thread Theodore Ts'o
On Tue, Nov 12, 2013 at 09:55:29AM +0100, Daniel Borkmann wrote: > > As per Hannes' suggestion, the result should look like (see cover > letter in [1]): > > if (r->entropy_total > 128) { > r->initialized = 1; > r->entropy_total = 0; > if (r == &nonblocking_pool) { >

Re: linux-next: manual merge of the random tree with the net-next tree

2013-11-12 Thread Stephen Rothwell
Hi Daniel, On Tue, 12 Nov 2013 09:55:29 +0100 Daniel Borkmann wrote: > > On 11/12/2013 05:55 AM, Stephen Rothwell wrote: > > > > Today's linux-next merge of the random tree got a conflict in > > drivers/char/random.c between commit 0244ad004a54 ("random32: add > > prandom_reseed_late() and call w

Re: linux-next: manual merge of the random tree with the net-next tree

2013-11-12 Thread Daniel Borkmann
Hi Stephen, On 11/12/2013 05:55 AM, Stephen Rothwell wrote: Hi Ted, Today's linux-next merge of the random tree got a conflict in drivers/char/random.c between commit 0244ad004a54 ("random32: add prandom_reseed_late() and call when nonblocking pool becomes initialized") from the net-next tree a