[GFS2] Fix up merge of Linus' kernel into GFS2 (363e065c) · Commits · 戴 / test

CREDITS

+7 −0

Original line number	Diff line number	Diff line
		@@ -2384,6 +2384,13 @@ N: Thomas Molina
		E: tmolina@cablespeed.com
		D: bug fixes, documentation, minor hackery

		N: Paul Moore
		E: paul.moore@hp.com
		D: NetLabel author
		S: Hewlett-Packard
		S: 110 Spit Brook Road
		S: Nashua, NH 03062

		N: James Morris
		E: jmorris@namei.org
		W: http://namei.org/

Documentation/00-INDEX

+2 −0

Original line number	Diff line number	Diff line
		@@ -184,6 +184,8 @@ mtrr.txt
		- how to use PPro Memory Type Range Registers to increase performance.
		nbd.txt
		- info on a TCP implementation of a network block device.
		netlabel/
		- directory with information on the NetLabel subsystem.
		networking/
		- directory with info on various aspects of networking with Linux.
		nfsroot.txt

Documentation/Changes

+3 −4

Original line number	Diff line number	Diff line
		@@ -37,15 +37,14 @@ o e2fsprogs 1.29 # tune2fs
		o jfsutils 1.1.3 # fsck.jfs -V
		o reiserfsprogs 3.6.3 # reiserfsck -V 2>&1\|grep reiserfsprogs
		o xfsprogs 2.6.0 # xfs_db -V
		o pcmciautils 004
		o pcmcia-cs 3.1.21 # cardmgr -V
		o pcmciautils 004 # pccardctl -V
		o quota-tools 3.09 # quota -V
		o PPP 2.4.0 # pppd --version
		o isdn4k-utils 3.1pre1 # isdnctrl 2>&1\|grep version
		o nfs-utils 1.0.5 # showmount --version
		o procps 3.2.0 # ps --version
		o oprofile 0.9 # oprofiled --version
		o udev 071 # udevinfo -V
		o udev 081 # udevinfo -V

		Kernel compilation
		==================
		@@ -268,7 +267,7 @@ active clients.

		To enable this new functionality, you need to:

		mount -t nfsd nfsd /proc/fs/nfs
		mount -t nfsd nfsd /proc/fs/nfsd

		before running exportfs or mountd. It is recommended that all NFS
		services be protected from the internet-at-large by a firewall where

Documentation/DocBook/libata.tmpl

+6 −6

Original line number	Diff line number	Diff line
		@@ -868,18 +868,18 @@ and other resources, etc.

		<chapter id="libataExt">
		<title>libata Library</title>
		!Edrivers/scsi/libata-core.c
		!Edrivers/ata/libata-core.c
		</chapter>

		<chapter id="libataInt">
		<title>libata Core Internals</title>
		!Idrivers/scsi/libata-core.c
		!Idrivers/ata/libata-core.c
		</chapter>

		<chapter id="libataScsiInt">
		<title>libata SCSI translation/emulation</title>
		!Edrivers/scsi/libata-scsi.c
		!Idrivers/scsi/libata-scsi.c
		!Edrivers/ata/libata-scsi.c
		!Idrivers/ata/libata-scsi.c
		</chapter>

		<chapter id="ataExceptions">
		@@ -1600,12 +1600,12 @@ and other resources, etc.

		<chapter id="PiixInt">
		<title>ata_piix Internals</title>
		!Idrivers/scsi/ata_piix.c
		!Idrivers/ata/ata_piix.c
		</chapter>

		<chapter id="SILInt">
		<title>sata_sil Internals</title>
		!Idrivers/scsi/sata_sil.c
		!Idrivers/ata/sata_sil.c
		</chapter>

		<chapter id="libataThanks">

Documentation/crypto/api-intro.txt

+22 −14

Original line number	Diff line number	Diff line
		@@ -19,15 +19,14 @@ At the lowest level are algorithms, which register dynamically with the
		API.

		'Transforms' are user-instantiated objects, which maintain state, handle all
		of the implementation logic (e.g. manipulating page vectors), provide an
		abstraction to the underlying algorithms, and handle common logical
		operations (e.g. cipher modes, HMAC for digests). However, at the user
		of the implementation logic (e.g. manipulating page vectors) and provide an
		abstraction to the underlying algorithms. However, at the user
		level they are very simple.

		Conceptually, the API layering looks like this:

		[transform api] (user interface)
		[transform ops] (per-type logic glue e.g. cipher.c, digest.c)
		[transform ops] (per-type logic glue e.g. cipher.c, compress.c)
		[algorithm api] (for registering algorithms)

		The idea is to make the user interface and algorithm registration API
		@@ -44,22 +43,27 @@ under development.
		Here's an example of how to use the API:

		#include <linux/crypto.h>
		#include <linux/err.h>
		#include <linux/scatterlist.h>

		struct scatterlist sg[2];
		char result[128];
		struct crypto_tfm *tfm;
		struct crypto_hash *tfm;
		struct hash_desc desc;

		tfm = crypto_alloc_tfm("md5", 0);
		if (tfm == NULL)
		tfm = crypto_alloc_hash("md5", 0, CRYPTO_ALG_ASYNC);
		if (IS_ERR(tfm))
		fail();

		/* ... set up the scatterlists ... */

		crypto_digest_init(tfm);
		crypto_digest_update(tfm, &sg, 2);
		crypto_digest_final(tfm, result);
		desc.tfm = tfm;
		desc.flags = 0;

		crypto_free_tfm(tfm);
		if (crypto_hash_digest(&desc, &sg, 2, result))
		fail();

		crypto_free_hash(tfm);


		Many real examples are available in the regression test module (tcrypt.c).
		@@ -126,7 +130,7 @@ might already be working on.
		BUGS

		Send bug reports to:
		James Morris <jmorris@redhat.com>
		Herbert Xu <herbert@gondor.apana.org.au>
		Cc: David S. Miller <davem@redhat.com>


		@@ -134,13 +138,14 @@ FURTHER INFORMATION

		For further patches and various updates, including the current TODO
		list, see:
		http://samba.org/~jamesm/crypto/
		http://gondor.apana.org.au/~herbert/crypto/


		AUTHORS

		James Morris
		David S. Miller
		Herbert Xu


		CREDITS
		@@ -238,8 +243,11 @@ Anubis algorithm contributors:
		Tiger algorithm contributors:
		Aaron Grothe

		VIA PadLock contributors:
		Michal Ludvig

		Generic scatterwalk code by Adam J. Richter <adam@yggdrasil.com>

		Please send any credits updates or corrections to:
		James Morris <jmorris@redhat.com>
		Herbert Xu <herbert@gondor.apana.org.au>

Admin message