---

yaml
---
r: 38173
b: refs/heads/master
c: fba4366
h: refs/heads/master
i:
  38171: fd2625a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d86d9b8cab45adf64e2ea8fe975bec3282b5de81
+refs/heads/master: fba43665360d361d338efd120a34ad615ca960d8

trunk/.gitignore

@@ -12,9 +12,6 @@
 *.ko
 *.so
 *.mod.c
-*.i
-*.lst
-*.symtypes
 
 #
 # Top-level generic files

trunk/CREDITS

@@ -2384,13 +2384,6 @@ 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/

trunk/Documentation/00-INDEX

@@ -184,8 +184,6 @@ 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

trunk/Documentation/Changes

@@ -37,14 +37,15 @@ 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                     # pccardctl -V
+o  pcmciautils            004
+o  pcmcia-cs              3.1.21                  # cardmgr -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                   081                     # udevinfo -V
+o  udev                   071                     # udevinfo -V
 
 Kernel compilation
 ==================
@@ -267,7 +268,7 @@ active clients.
 
 To enable this new functionality, you need to:
 
-  mount -t nfsd nfsd /proc/fs/nfsd
+  mount -t nfsd nfsd /proc/fs/nfs
 
 before running exportfs or mountd.  It is recommended that all NFS
 services be protected from the internet-at-large by a firewall where

trunk/Documentation/DocBook/libata.tmpl

@@ -868,18 +868,18 @@ and other resources, etc.
 
   <chapter id="libataExt">
      <title>libata Library</title>
-!Edrivers/ata/libata-core.c
+!Edrivers/scsi/libata-core.c
   </chapter>
 
   <chapter id="libataInt">
      <title>libata Core Internals</title>
-!Idrivers/ata/libata-core.c
+!Idrivers/scsi/libata-core.c
   </chapter>
 
   <chapter id="libataScsiInt">
      <title>libata SCSI translation/emulation</title>
-!Edrivers/ata/libata-scsi.c
-!Idrivers/ata/libata-scsi.c
+!Edrivers/scsi/libata-scsi.c
+!Idrivers/scsi/libata-scsi.c
   </chapter>
 
   <chapter id="ataExceptions">
@@ -1600,12 +1600,12 @@ and other resources, etc.
 
   <chapter id="PiixInt">
      <title>ata_piix Internals</title>
-!Idrivers/ata/ata_piix.c
+!Idrivers/scsi/ata_piix.c
   </chapter>
 
   <chapter id="SILInt">
      <title>sata_sil Internals</title>
-!Idrivers/ata/sata_sil.c
+!Idrivers/scsi/sata_sil.c
   </chapter>
 
   <chapter id="libataThanks">

trunk/Documentation/crypto/api-intro.txt

@@ -19,14 +19,15 @@ 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) and provide an 
-abstraction to the underlying algorithms.  However, at the user 
+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 
 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, compress.c)
+  [transform ops]  (per-type logic glue e.g. cipher.c, digest.c)
   [algorithm api]  (for registering algorithms)
 
 The idea is to make the user interface and algorithm registration API
@@ -43,27 +44,22 @@ 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_hash *tfm;
-	struct hash_desc desc;
+	struct crypto_tfm *tfm;
 
-	tfm = crypto_alloc_hash("md5", 0, CRYPTO_ALG_ASYNC);
-	if (IS_ERR(tfm))
+	tfm = crypto_alloc_tfm("md5", 0);
+	if (tfm == NULL)
 		fail();
 
 	/* ... set up the scatterlists ... */
-
-	desc.tfm = tfm;
-	desc.flags = 0;
 
-	if (crypto_hash_digest(&desc, &sg, 2, result))
-		fail();
+	crypto_digest_init(tfm);
+	crypto_digest_update(tfm, &sg, 2);
+	crypto_digest_final(tfm, result);
 
-	crypto_free_hash(tfm);
+	crypto_free_tfm(tfm);
 
 
 Many real examples are available in the regression test module (tcrypt.c).
@@ -130,22 +126,21 @@ might already be working on.
 BUGS
 
 Send bug reports to:
-Herbert Xu <herbert@gondor.apana.org.au>
+James Morris <jmorris@redhat.com>
 Cc: David S. Miller <davem@redhat.com>
 
 
 FURTHER INFORMATION
 
 For further patches and various updates, including the current TODO
 list, see:
-http://gondor.apana.org.au/~herbert/crypto/
+http://samba.org/~jamesm/crypto/
 
 
 AUTHORS
 
 James Morris
 David S. Miller
-Herbert Xu
 
 
 CREDITS
@@ -243,11 +238,8 @@ 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:
-Herbert Xu <herbert@gondor.apana.org.au>
+James Morris <jmorris@redhat.com>
 

trunk/Documentation/dontdiff

@@ -135,7 +135,6 @@ tags
 times.h*
 tkparse
 trix_boot.h
-utsrelease.h*
 version.h*
 vmlinux
 vmlinux-*

trunk/Documentation/feature-removal-schedule.txt

@@ -281,16 +281,3 @@ Why:	The deferred output hooks are a layering violation causing unusual
 Who:	Patrick McHardy <kaber@trash.net>
 
 ---------------------------
-
-What:	frame diverter
-When:	November 2006
-Why:	The frame diverter is included in most distribution kernels, but is
-	broken. It does not correctly handle many things:
-	- IPV6
-	- non-linear skb's
-	- network device RCU on removal
-	- input frames not correctly checked for protocol errors
-	It also adds allocation overhead even if not enabled.
-	It is not clear if anyone is still using it.
-Who:	Stephen Hemminger <shemminger@osdl.org>
-

trunk/Documentation/kbuild/kconfig-language.txt

@@ -67,19 +67,19 @@ applicable everywhere (see syntax).
 - default value: "default" <expr> ["if" <expr>]
   A config option can have any number of default values. If multiple
   default values are visible, only the first defined one is active.
-  Default values are not limited to the menu entry where they are
-  defined. This means the default can be defined somewhere else or be
+  Default values are not limited to the menu entry, where they are
+  defined, this means the default can be defined somewhere else or be
   overridden by an earlier definition.
   The default value is only assigned to the config symbol if no other
   value was set by the user (via the input prompt above). If an input
   prompt is visible the default value is presented to the user and can
   be overridden by him.
-  Optionally, dependencies only for this default value can be added with
+  Optionally dependencies only for this default value can be added with
   "if".
 
 - dependencies: "depends on"/"requires" <expr>
   This defines a dependency for this menu entry. If multiple
-  dependencies are defined, they are connected with '&&'. Dependencies
+  dependencies are defined they are connected with '&&'. Dependencies
   are applied to all other options within this menu entry (which also
   accept an "if" expression), so these two examples are equivalent:
 
@@ -153,7 +153,7 @@ Nonconstant symbols are the most common ones and are defined with the
 'config' statement. Nonconstant symbols consist entirely of alphanumeric
 characters or underscores.
 Constant symbols are only part of expressions. Constant symbols are
-always surrounded by single or double quotes. Within the quote, any
+always surrounded by single or double quotes. Within the quote any
 other character is allowed and the quotes can be escaped using '\'.
 
 Menu structure
@@ -237,7 +237,7 @@ choices:
 	<choice block>
 	"endchoice"
 
-This defines a choice group and accepts any of the above attributes as
+This defines a choice group and accepts any of above attributes as
 options. A choice can only be of type bool or tristate, while a boolean
 choice only allows a single config entry to be selected, a tristate
 choice also allows any number of config entries to be set to 'm'. This