Commit 5aa1c96e authored by Andrew Morton's avatar Andrew Morton
Browse files

Merge branch 'master' into mm-hotfixes-stable

parents fe33c0fb 1b1934db

Documentation/admin-guide/features.rst

+1 −1
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



.. kernel-feat:: $srctree/Documentation/features
 
.. kernel-feat:: features

Documentation/admin-guide/hw_random.rst

+2 −3
Original line number Diff line number Diff line
@@ -14,10 +14,9 @@ into that core. 


To make the most effective use of these mechanisms, you

should download the support software as well.  Download the

latest version of the "rng-tools" package from the

hw_random driver's official Web site:

latest version of the "rng-tools" package from:



	http://sourceforge.net/projects/gkernel/

	https://github.com/nhorman/rng-tools



Those tools use /dev/hwrng to fill the kernel entropy pool,

which is used internally and exported by the /dev/urandom and

Documentation/arch/arc/features.rst

+1 −1
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



.. kernel-feat:: $srctree/Documentation/features arc
 
.. kernel-feat:: features arc

Documentation/arch/arm/features.rst

+1 −1
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



.. kernel-feat:: $srctree/Documentation/features arm
 
.. kernel-feat:: features arm

Documentation/arch/arm64/features.rst

+1 −1
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



.. kernel-feat:: $srctree/Documentation/features arm64
 
.. kernel-feat:: features arm64