Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00dd7b7d authored by James Bottomley's avatar James Bottomley
Browse files

Merge ../linux-2.6 



Conflicts:

	arch/ia64/hp/sim/simscsi.c

Stylistic differences in two separate fixes for buffer->request_buffer
problem.

Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parents 58b3ac07 6e1e6325

.gitignore

+5 −0
Original line number Diff line number Diff line
@@ -30,6 +30,11 @@ include/config 
include/linux/autoconf.h

include/linux/compile.h

include/linux/version.h

include/linux/utsrelease.h



# stgit generated dirs

patches-*



# quilt's files

patches

series

Documentation/DocBook/kernel-api.tmpl

+5 −4
Original line number Diff line number Diff line
@@ -58,6 +58,9 @@ 
!Iinclude/linux/ktime.h

!Iinclude/linux/hrtimer.h

!Ekernel/hrtimer.c

     </sect1>

     <sect1><title>Workqueues and Kevents</title>

!Ekernel/workqueue.c

     </sect1>

     <sect1><title>Internal Functions</title>

!Ikernel/exit.c
@@ -300,7 +303,7 @@ X!Ekernel/module.c 
     </sect1>



     <sect1><title>Resources Management</title>

!Ekernel/resource.c

!Ikernel/resource.c

     </sect1>



     <sect1><title>MTRR Handling</title>
@@ -312,9 +315,7 @@ X!Ekernel/module.c 
!Edrivers/pci/pci-driver.c

!Edrivers/pci/remove.c

!Edrivers/pci/pci-acpi.c

<!-- kerneldoc does not understand __devinit

X!Edrivers/pci/search.c

 -->

!Edrivers/pci/search.c

!Edrivers/pci/msi.c

!Edrivers/pci/bus.c

<!-- FIXME: Removed for now since no structured comments in source

Documentation/SubmittingPatches

+4 −6
Original line number Diff line number Diff line
@@ -10,7 +10,9 @@ kernel, the process can sometimes be daunting if you're not familiar 
with "the system."  This text is a collection of suggestions which

can greatly increase the chances of your change being accepted.



If you are submitting a driver, also read Documentation/SubmittingDrivers.

Read Documentation/SubmitChecklist for a list of items to check

before submitting code.  If you are submitting a driver, also read

Documentation/SubmittingDrivers.
@@ -74,9 +76,6 @@ There are a number of scripts which can aid in this: 
Quilt:

http://savannah.nongnu.org/projects/quilt



Randy Dunlap's patch scripts:

http://www.xenotime.net/linux/scripts/patching-scripts-002.tar.gz



Andrew Morton's patch scripts:

http://www.zip.com.au/~akpm/linux/patches/

Instead of these scripts, quilt is the recommended patch management
@@ -484,7 +483,7 @@ Greg Kroah-Hartman "How to piss off a kernel subsystem maintainer". 
  <http://www.kroah.com/log/2005/10/19/>

  <http://www.kroah.com/log/2006/01/11/>



NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!.

NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!

  <http://marc.theaimsgroup.com/?l=linux-kernel&m=112112749912944&w=2>



Kernel Documentation/CodingStyle
@@ -493,4 +492,3 @@ Kernel Documentation/CodingStyle 
Linus Torvald's mail on the canonical patch format:

  <http://lkml.org/lkml/2005/4/7/183>

--
 
Last updated on 17 Nov 2005.

Documentation/accounting/delay-accounting.txt

+6 −4
Original line number Diff line number Diff line
@@ -64,11 +64,13 @@ Compile the kernel with 
	CONFIG_TASK_DELAY_ACCT=y

	CONFIG_TASKSTATS=y



Enable the accounting at boot time by adding

the following to the kernel boot options

	delayacct

Delay accounting is enabled by default at boot up.

To disable, add

   nodelayacct

to the kernel boot options. The rest of the instructions

below assume this has not been done.



and after the system has booted up, use a utility

After the system has booted up, use a utility

similar to  getdelays.c to access the delays

seen by a given task or a task group (tgid).

The utility also allows a given command to be

Documentation/cpu-freq/user-guide.txt

+4 −1
Original line number Diff line number Diff line
@@ -157,6 +157,9 @@ scaling_min_freq and 
scaling_max_freq		show the current "policy limits" (in

				kHz). By echoing new values into these

				files, you can change these limits.

				NOTE: when setting a policy you need to

				first set scaling_max_freq, then

				scaling_min_freq.





If you have selected the "userspace" governor which allows you to