Re: /dev/random changes for 3.13

2013-11-15 Thread Theodore Ts'o
On Fri, Nov 15, 2013 at 01:58:05PM -0800, Linus Torvalds wrote: > Ok, I finally got around to the random tree, but your proposed merge > resolution makes no sense, so I didn't end up applying it. > > > - - r->entropy_total += nbits; > > if (!r->initialized && nbits > 0) { > > +

Re: /dev/random changes for 3.13

2013-11-15 Thread Linus Torvalds
On Wed, Nov 13, 2013 at 10:52 PM, Theodore Ts'o wrote: > > There will be a merge conflict thanks to changes from the net tree. > Here is the proposed resolution: Ok, I finally got around to the random tree, but your proposed merge resolution makes no sense, so I didn't end up applying it. > - -

Re: /dev/random changes for 3.13

2013-11-13 Thread Theodore Ts'o
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On Wed, Nov 13, 2013 at 09:03:32PM -0500, Theodore Ts'o wrote: > The following changes since commit 6e4664525b1db28f8c4e1130957f70a94c19213e: > > Linux 3.11 (2013-09-02 13:46:10 -0700) > > are available in the git repository at: > > git://git.

/dev/random changes for 3.13

2013-11-13 Thread Theodore Ts'o
392a546dc8368d1745f9891ef3f8f7c380de8650: random: add debugging code to detect early use of get_random_bytes() (2013-11-03 18:24:08 -0500) The /dev/random changes for 3.13 including a number of improvements in the following areas: performance