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

Commit b2315372 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge branch 'linux-2.6' into for-2.6.24

parents 5326152f c87ce658

Documentation/00-INDEX

+0 −2
Original line number Diff line number Diff line
@@ -134,8 +134,6 @@ dvb/ 
	- info on Linux Digital Video Broadcast (DVB) subsystem.

early-userspace/

	- info about initramfs, klibc, and userspace early during boot.

ecryptfs.txt

	- docs on eCryptfs: stacked cryptographic filesystem for Linux.

eisa.txt

	- info on EISA bus support.

exception.txt

Documentation/SubmittingPatches

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ the reviewers time and will get your patch rejected, probably 
without even being read.



At a minimum you should check your patches with the patch style

checker prior to submission (scripts/patchcheck.pl).  You should

checker prior to submission (scripts/checkpatch.pl).  You should

be able to justify all violations that remain in your patch.

Documentation/filesystems/00-INDEX

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ directory-locking 
	- info about the locking scheme used for directory operations.

dlmfs.txt

	- info on the userspace interface to the OCFS2 DLM.

ecryptfs.txt

	- docs on eCryptfs: stacked cryptographic filesystem for Linux.

ext2.txt

	- info, mount options and specifications for the Ext2 filesystem.

ext3.txt

Documentation/filesystems/ocfs2.txt

+9 −4
Original line number Diff line number Diff line
@@ -28,11 +28,7 @@ Manish Singh <manish.singh@oracle.com> 
Caveats

=======

Features which OCFS2 does not support yet:

	- sparse files

	- extended attributes

	- shared writable mmap

	- loopback is supported, but data written will not

	  be cluster coherent.

	- quotas

	- cluster aware flock

	- cluster aware lockf
@@ -57,3 +53,12 @@ nointr Do not allow signals to interrupt cluster 
atime_quantum=60(*)	OCFS2 will not update atime unless this number

			of seconds has passed since the last update.

			Set to zero to always update atime.

data=ordered	(*)	All data are forced directly out to the main file

			system prior to its metadata being committed to the

			journal.

data=writeback		Data ordering is not preserved, data may be written

			into the main file system after its metadata has been

			committed to the journal.

preferred_slot=0(*)	During mount, try to use this filesystem slot first. If

			it is in use by another node, the first empty one found

			will be chosen. Invalid values will be ignored.

Documentation/i2c/busses/i2c-piix4

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ Supported adapters: 
    Datasheet: Publicly available at the Intel website

  * ServerWorks OSB4, CSB5, CSB6 and HT-1000 southbridges

    Datasheet: Only available via NDA from ServerWorks

  * ATI IXP200, IXP300, IXP400, SB600 and SB700 southbridges

  * ATI IXP200, IXP300, IXP400, SB600, SB700 and SB800 southbridges

    Datasheet: Not publicly available

  * Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge

    Datasheet: Publicly available at the SMSC website http://www.smsc.com