---

yaml
---
r: 6128
b: refs/heads/master
c: 1c7c1fe
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2321fbd2b87539edc1fbfc2e186528a1ef93835f
+refs/heads/master: 1c7c1fe51629d82e1dff22b2c4d409b252fb2b05

trunk/CREDITS

@@ -1624,10 +1624,10 @@ E: ajoshi@shell.unixbox.com
 D: fbdev hacking
 
 N: Jesper Juhl
-E: jesper.juhl@gmail.com
-D: Various fixes, cleanups and minor features.
+E: juhl-lkml@dif.dk
+D: Various small janitor fixes, cleanups etc.
 S: Lemnosvej 1, 3.tv
-S: 2300 Copenhagen S.
+S: 2300 Copenhagen S
 S: Denmark
 
 N: Jozsef Kadlecsik
@@ -2380,8 +2380,8 @@ E: tmolina@cablespeed.com
 D: bug fixes, documentation, minor hackery
 
 N: James Morris
-E: jmorris@namei.org
-W: http://namei.org/
+E: jmorris@redhat.com
+W: http://www.intercode.com.au/jmorris/
 D: Netfilter, Linux Security Modules (LSM), SELinux, IPSec,
 D: Crypto API, general networking, miscellaneous.
 S: PO Box 707
@@ -2423,7 +2423,8 @@ S: Toronto, Ontario
 S: Canada
 
 N: Zwane Mwaikambo
-E: zwane@arm.linux.org.uk
+E: zwane@linuxpower.ca
+W: http://function.linuxpower.ca
 D: Various driver hacking
 D: Lowlevel x86 kernel hacking
 D: General debugging

trunk/Documentation/Changes

@@ -65,7 +65,6 @@ 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                   058                     # udevinfo -V
 
 Kernel compilation
 ==================

trunk/Documentation/SubmittingPatches

@@ -149,11 +149,6 @@ USB, framebuffer devices, the VFS, the SCSI subsystem, etc.  See the
 MAINTAINERS file for a mailing list that relates specifically to
 your change.
 
-If changes affect userland-kernel interfaces, please send
-the MAN-PAGES maintainer (as listed in the MAINTAINERS file)
-a man-pages patch, or at least a notification of the change,
-so that some information makes its way into the manual pages.
-
 Even if the maintainer did not respond in step #4, make sure to ALWAYS
 copy the maintainer when you change their code.
 

trunk/Documentation/acpi-hotkey.txt

@@ -33,6 +33,3 @@ The result of the execution of this aml method is
 attached to /proc/acpi/hotkey/poll_method, which is dnyamically
 created.  Please use command "cat /proc/acpi/hotkey/polling_method" 
 to retrieve it.
-
-Note: Use cmdline "acpi_generic_hotkey" to over-ride
-loading any platform specific drivers.

trunk/Documentation/dontdiff

@@ -104,7 +104,6 @@ logo_*.c
 logo_*_clut224.c
 logo_*_mono.c
 lxdialog
-mach-types
 mach-types.h
 make_times_h
 map

trunk/Documentation/fb/vesafb.txt

@@ -144,21 +144,7 @@ vgapal	Use the standard vga registers for palette changes.
 	This is the default.
 pmipal	Use the protected mode interface for palette changes.
 
-mtrr:n	setup memory type range registers for the vesafb framebuffer
-	where n:
-	      0 - disabled (equivalent to nomtrr)
-	      1 - uncachable
-	      2 - write-back
-	      3 - write-combining (default)
-	      4 - write-through
-
-	If you see the following in dmesg, choose the type that matches the
-	old one. In this example, use "mtrr:2".
-...
-mtrr: type mismatch for e0000000,8000000 old: write-back new: write-combining
-...
-
-nomtrr  disable mtrr
+mtrr	setup memory type range registers for the vesafb framebuffer.
 
 vremap:n
         remap 'n' MiB of video RAM. If 0 or not specified, remap memory

trunk/Documentation/infiniband/user_mad.txt

@@ -28,37 +28,13 @@ Creating MAD agents
 
 Receiving MADs
 
-  MADs are received using read().  The receive side now supports
-  RMPP. The buffer passed to read() must be at least one
-  struct ib_user_mad + 256 bytes. For example:
-
-  If the buffer passed is not large enough to hold the received
-  MAD (RMPP), the errno is set to ENOSPC and the length of the
-  buffer needed is set in mad.length.
-
-  Example for normal MAD (non RMPP) reads:
-	struct ib_user_mad *mad;
-	mad = malloc(sizeof *mad + 256);
-	ret = read(fd, mad, sizeof *mad + 256);
-	if (ret != sizeof mad + 256) {
-		perror("read");
-		free(mad);
-	}
-
-  Example for RMPP reads:
-	struct ib_user_mad *mad;
-	mad = malloc(sizeof *mad + 256);
-	ret = read(fd, mad, sizeof *mad + 256);
-	if (ret == -ENOSPC)) {
-		length = mad.length;
-		free(mad);
-		mad = malloc(sizeof *mad + length);
-		ret = read(fd, mad, sizeof *mad + length);
-	}
-	if (ret < 0) {
+  MADs are received using read().  The buffer passed to read() must be
+  large enough to hold at least one struct ib_user_mad.  For example:
+
+	struct ib_user_mad mad;
+	ret = read(fd, &mad, sizeof mad);
+	if (ret != sizeof mad)
 		perror("read");
-		free(mad);
-	}
 
   In addition to the actual MAD contents, the other struct ib_user_mad
   fields will be filled in with information on the received MAD.  For
@@ -74,21 +50,18 @@ Sending MADs
 
   MADs are sent using write().  The agent ID for sending should be
   filled into the id field of the MAD, the destination LID should be
-  filled into the lid field, and so on.  The send side does support
-  RMPP so arbitrary length MAD can be sent. For example:
-
-	struct ib_user_mad *mad;
+  filled into the lid field, and so on.  For example:
 
-	mad = malloc(sizeof *mad + mad_length);
+	struct ib_user_mad mad;
 
-	/* fill in mad->data */
+	/* fill in mad.data */
 
-	mad->hdr.id  = my_agent;	/* req.id from agent registration */
-	mad->hdr.lid = my_dest;		/* in network byte order... */
+	mad.id  = my_agent;	/* req.id from agent registration */
+	mad.lid = my_dest;	/* in network byte order... */
 	/* etc. */
 
-	ret = write(fd, &mad, sizeof *mad + mad_length);
-	if (ret != sizeof *mad + mad_length)
+	ret = write(fd, &mad, sizeof mad);
+	if (ret != sizeof mad)
 		perror("write");
 
 Setting IsSM Capability Bit

trunk/Documentation/kernel-parameters.txt

@@ -159,11 +159,6 @@ running once the system is up.
 
 	acpi_fake_ecdt	[HW,ACPI] Workaround failure due to BIOS lacking ECDT
 
-	acpi_generic_hotkey [HW,ACPI]
-			Allow consolidated generic hotkey driver to
-			over-ride platform specific driver.
-			See also Documentation/acpi-hotkey.txt.
-
 	ad1816=		[HW,OSS]
 			Format: <io>,<irq>,<dma>,<dma2>
 			See also Documentation/sound/oss/AD1816.