---

yaml
---
r: 38143
b: refs/heads/master
c: 98e5a15
h: refs/heads/master
i:
  38141: 1fb7769
  38139: 7289d19
  38135: a60cb77
  38127: 3f9b90b
  38111: 94a77fe
  38079: e5482c7
  38015: c46ec45
  37887: 5cb9166
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b2a1fd1b394c60eaa2587716102dd5e9b4e5990
+refs/heads/master: 98e5a1579e7d34fe3803240750a1c48efcd9cb15

trunk/CREDITS

@@ -951,12 +951,6 @@ S: Brevia 1043
 S: S-114 79 Stockholm
 S: Sweden
 
-N: Pekka Enberg
-E: penberg@cs.helsinki.fi
-W: http://www.cs.helsinki.fi/u/penberg/
-D: Various kernel hacks, fixes, and cleanups.
-S: Finland
-
 N: David Engebretsen
 E: engebret@us.ibm.com
 D: Linux port to 64-bit PowerPC architecture

trunk/Documentation/DocBook/kernel-api.tmpl

@@ -325,13 +325,8 @@ X!Ekernel/module.c
 !Ekernel/irq/manage.c
      </sect1>
 
-     <sect1><title>DMA Channels</title>
-!Ekernel/dma.c
-     </sect1>
-
      <sect1><title>Resources Management</title>
 !Ikernel/resource.c
-!Ekernel/resource.c
      </sect1>
 
      <sect1><title>MTRR Handling</title>

trunk/Documentation/HOWTO

@@ -375,26 +375,6 @@ of information is needed by the kernel developers to help track down the
 problem.
 
 
-Managing bug reports
---------------------
-
-One of the best ways to put into practice your hacking skills is by fixing
-bugs reported by other people. Not only you will help to make the kernel
-more stable, you'll learn to fix real world problems and you will improve
-your skills, and other developers will be aware of your presence. Fixing
-bugs is one of the best ways to earn merit amongst the developers, because
-not many people like wasting time fixing other people's bugs.
-
-To work in the already reported bug reports, go to http://bugzilla.kernel.org.
-If you want to be advised of the future bug reports, you can subscribe to the
-bugme-new mailing list (only new bug reports are mailed here) or to the
-bugme-janitor mailing list (every change in the bugzilla is mailed here)
-
-	http://lists.osdl.org/mailman/listinfo/bugme-new
-	http://lists.osdl.org/mailman/listinfo/bugme-janitors
-
-
-
 Mailing lists
 -------------
 

trunk/Documentation/IPMI.txt

@@ -326,12 +326,9 @@ for events, they will all receive all events that come in.
 
 For receiving commands, you have to individually register commands you
 want to receive.  Call ipmi_register_for_cmd() and supply the netfn
-and command name for each command you want to receive.  You also
-specify a bitmask of the channels you want to receive the command from
-(or use IPMI_CHAN_ALL for all channels if you don't care).  Only one
-user may be registered for each netfn/cmd/channel, but different users
-may register for different commands, or the same command if the
-channel bitmasks do not overlap.
+and command name for each command you want to receive.  Only one user
+may be registered for each netfn/cmd, but different users may register
+for different commands.
 
 From userland, equivalent IOCTLs are provided to do these functions.
 
@@ -364,7 +361,6 @@ You can change this at module load time (for a module) with:
        regspacings=<sp1>,<sp2>,... regsizes=<size1>,<size2>,...
        regshifts=<shift1>,<shift2>,...
        slave_addrs=<addr1>,<addr2>,...
-       force_kipmid=<enable1>,<enable2>,...
 
 Each of these except si_trydefaults is a list, the first item for the
 first interface, second item for the second interface, etc.
@@ -410,13 +406,7 @@ The slave_addrs specifies the IPMI address of the local BMC.  This is
 usually 0x20 and the driver defaults to that, but in case it's not, it
 can be specified when the driver starts up.
 
-The force_ipmid parameter forcefully enables (if set to 1) or disables
-(if set to 0) the kernel IPMI daemon.  Normally this is auto-detected
-by the driver, but systems with broken interrupts might need an enable,
-or users that don't want the daemon (don't need the performance, don't
-want the CPU hit) can disable it.
-
-When compiled into the kernel, the parameters can be specified on the
+When compiled into the kernel, the addresses can be specified on the
 kernel command line as:
 
   ipmi_si.type=<type1>,<type2>...
@@ -426,7 +416,6 @@ kernel command line as:
        ipmi_si.regsizes=<size1>,<size2>,...
        ipmi_si.regshifts=<shift1>,<shift2>,...
        ipmi_si.slave_addrs=<addr1>,<addr2>,...
-       ipmi_si.force_kipmid=<enable1>,<enable2>,...
 
 It works the same as the module parameters of the same names.
 

trunk/Documentation/SubmitChecklist

@@ -64,5 +64,3 @@ kernel patches.
 
 19: All new userspace interfaces are documented in Documentation/ABI/.
     See Documentation/ABI/README for more information.
-
-20: Check that it all passes `make headers_check'.

trunk/Documentation/accounting/getdelays.c

@@ -285,7 +285,7 @@ int main(int argc, char *argv[])
 	if (maskset) {
 		rc = send_cmd(nl_sd, id, mypid, TASKSTATS_CMD_GET,
 			      TASKSTATS_CMD_ATTR_REGISTER_CPUMASK,
-			      &cpumask, strlen(cpumask) + 1);
+			      &cpumask, sizeof(cpumask));
 		PRINTF("Sent register cpumask, retval %d\n", rc);
 		if (rc < 0) {
 			printf("error sending register cpumask\n");
@@ -315,8 +315,7 @@ int main(int argc, char *argv[])
 		}
 		if (msg.n.nlmsg_type == NLMSG_ERROR ||
 		    !NLMSG_OK((&msg.n), rep_len)) {
-			struct nlmsgerr *err = NLMSG_DATA(&msg);
-			printf("fatal reply error,  errno %d\n", err->error);
+			printf("fatal reply error,  errno %d\n", errno);
 			goto done;
 		}
 
@@ -384,7 +383,7 @@ int main(int argc, char *argv[])
 	if (maskset) {
 		rc = send_cmd(nl_sd, id, mypid, TASKSTATS_CMD_GET,
 			      TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK,
-			      &cpumask, strlen(cpumask) + 1);
+			      &cpumask, sizeof(cpumask));
 		printf("Sent deregister mask, retval %d\n", rc);
 		if (rc < 0)
 			err(rc, "error sending deregister cpumask\n");