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

Commit 6988f20f authored by Tejun Heo's avatar Tejun Heo
Browse files

Merge branch 'fixes-2.6.39' into for-2.6.40

parents 0415b00d 6ea0c34d

Documentation/ABI/testing/sysfs-bus-pci-devices-cciss

+12 −0
Original line number Original line Diff line number Diff line
@@ -59,3 +59,15 @@ Kernel Version: 2.6.31 
Contact:	iss_storagedev@hp.com

Contact:	iss_storagedev@hp.com

Description:	Displays the usage count (number of opens) of logical drive Y

Description:	Displays the usage count (number of opens) of logical drive Y

		of controller X.

		of controller X.



Where:		/sys/bus/pci/devices/<dev>/ccissX/resettable

Date:		February 2011

Kernel Version:	2.6.38

Contact:	iss_storagedev@hp.com

Description:	Value of 1 indicates the controller can honor the reset_devices

		kernel parameter.  Value of 0 indicates reset_devices cannot be

		honored.  This is to allow, for example, kexec tools to be able

		to warn the user if they designate an unresettable device as

		a dump device, as kdump requires resetting the device in order

		to work reliably.

Documentation/ABI/testing/sysfs-fs-ext4

+10 −3
Original line number Original line Diff line number Diff line
@@ -48,7 +48,7 @@ Description: 
		 will have its blocks allocated out of its own unique

		 will have its blocks allocated out of its own unique

		 preallocation pool.

		 preallocation pool.





What:		/sys/fs/ext4/<disk>/inode_readahead

What:		/sys/fs/ext4/<disk>/inode_readahead_blks

Date:		March 2008

Date:		March 2008

Contact:	"Theodore Ts'o" <tytso@mit.edu>

Contact:	"Theodore Ts'o" <tytso@mit.edu>

Description:

Description:
@@ -85,7 +85,14 @@ Date: June 2008 
Contact:	"Theodore Ts'o" <tytso@mit.edu>

Contact:	"Theodore Ts'o" <tytso@mit.edu>

Description:

Description:

		Tuning parameter which (if non-zero) controls the goal

		Tuning parameter which (if non-zero) controls the goal

		inode used by the inode allocator in p0reference to

		inode used by the inode allocator in preference to

		all other allocation hueristics.  This is intended for

		all other allocation heuristics.  This is intended for

		debugging use only, and should be 0 on production

		debugging use only, and should be 0 on production

		systems.

		systems.



What:		/sys/fs/ext4/<disk>/max_writeback_mb_bump

Date:		September 2009

Contact:	"Theodore Ts'o" <tytso@mit.edu>

Description:

		The maximum number of megabytes the writeback code will

		try to write out before move on to another inode.

Documentation/DocBook/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -55,7 +55,6 @@ mandocs: $(MAN) 
build_images = mkdir -p $(objtree)/Documentation/DocBook/media/ && \

build_images = mkdir -p $(objtree)/Documentation/DocBook/media/ && \

	       cp $(srctree)/Documentation/DocBook/dvb/*.png \

	       cp $(srctree)/Documentation/DocBook/dvb/*.png \

	          $(srctree)/Documentation/DocBook/v4l/*.gif \

	          $(srctree)/Documentation/DocBook/v4l/*.gif \

	          $(srctree)/Documentation/DocBook/v4l/*.png \

		  $(objtree)/Documentation/DocBook/media/

		  $(objtree)/Documentation/DocBook/media/





xmldoclinks:

xmldoclinks:

Documentation/DocBook/rapidio.tmpl

+0 −1
Original line number Original line Diff line number Diff line
@@ -133,7 +133,6 @@ 
!Idrivers/rapidio/rio-sysfs.c

!Idrivers/rapidio/rio-sysfs.c

     </sect1>

     </sect1>

     <sect1 id="PPC32_support"><title>PPC32 support</title>

     <sect1 id="PPC32_support"><title>PPC32 support</title>

!Earch/powerpc/sysdev/fsl_rio.c

!Iarch/powerpc/sysdev/fsl_rio.c

!Iarch/powerpc/sysdev/fsl_rio.c

     </sect1>

     </sect1>

  </chapter>

  </chapter>

Documentation/development-process/1.Intro

+9 −9
Original line number Original line Diff line number Diff line
@@ -56,13 +56,13 @@ information on kernel development. 




1.2: WHAT THIS DOCUMENT IS ABOUT

1.2: WHAT THIS DOCUMENT IS ABOUT





The Linux kernel, at over 6 million lines of code and well over 1000 active

The Linux kernel, at over 8 million lines of code and well over 1000

contributors, is one of the largest and most active free software projects

contributors to each release, is one of the largest and most active free

in existence.  Since its humble beginning in 1991, this kernel has evolved

software projects in existence.  Since its humble beginning in 1991, this

into a best-of-breed operating system component which runs on pocket-sized

kernel has evolved into a best-of-breed operating system component which

digital music players, desktop PCs, the largest supercomputers in

runs on pocket-sized digital music players, desktop PCs, the largest

existence, and all types of systems in between.  It is a robust, efficient,

supercomputers in existence, and all types of systems in between.  It is a

and scalable solution for almost any situation.

robust, efficient, and scalable solution for almost any situation.





With the growth of Linux has come an increase in the number of developers

With the growth of Linux has come an increase in the number of developers

(and companies) wishing to participate in its development.  Hardware

(and companies) wishing to participate in its development.  Hardware