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

Commit 77dd3b3b authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into timers/ntp

parents 916c7a85 70bb0896

Documentation/ABI/testing/sysfs-firmware-sgi_uv

0 → 100644
+27 −0
Original line number Original line Diff line number Diff line 
What:		/sys/firmware/sgi_uv/

Date:		August 2008

Contact:	Russ Anderson <rja@sgi.com>

Description:

		The /sys/firmware/sgi_uv directory contains information

		about the SGI UV platform.



		Under that directory are a number of files:



			partition_id

			coherence_id



		The partition_id entry contains the partition id.

		SGI UV systems can be partitioned into multiple physical

		machines, which each partition running a unique copy

		of the operating system.  Each partition will have a unique

		partition id.  To display the partition id, use the command:



			cat /sys/firmware/sgi_uv/partition_id



		The coherence_id entry contains the coherence id.

		A partitioned SGI UV system can have one or more coherence

		domain.  The coherence id indicates which coherence domain

		this partition is in.  To display the coherence id, use the

		command:



			cat /sys/firmware/sgi_uv/coherence_id

Documentation/dontdiff

+2 −0
Original line number Original line Diff line number Diff line
@@ -5,6 +5,8 @@ 
*.css

*.css

*.dvi

*.dvi

*.eps

*.eps

*.fw.gen.S

*.fw

*.gif

*.gif

*.grep

*.grep

*.grp

*.grp

Documentation/filesystems/ext4.txt

+6 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,12 @@ Mailing list: linux-ext4@vger.kernel.org 




    git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git

    git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git





  - Note that it is highly important to install the mke2fs.conf file

    that comes with the e2fsprogs 1.41.x sources in /etc/mke2fs.conf. If

    you have edited the /etc/mke2fs.conf file installed on your system,

    you will need to merge your changes with the version from e2fsprogs

    1.41.x.



  - Create a new filesystem using the ext4dev filesystem type:

  - Create a new filesystem using the ext4dev filesystem type:





    	# mke2fs -t ext4dev /dev/hda1

    	# mke2fs -t ext4dev /dev/hda1

Documentation/filesystems/ntfs.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -40,7 +40,7 @@ Web site 
========

========





There is plenty of additional information on the linux-ntfs web site

There is plenty of additional information on the linux-ntfs web site

at http://linux-ntfs.sourceforge.net/

at http://www.linux-ntfs.org/





The web site has a lot of additional information, such as a comprehensive

The web site has a lot of additional information, such as a comprehensive

FAQ, documentation on the NTFS on-disk format, information on the Linux-NTFS

FAQ, documentation on the NTFS on-disk format, information on the Linux-NTFS
@@ -272,7 +272,7 @@ And you would know that /dev/hda2 has a size of 37768814 - 4209030 + 1 = 
For Win2k and later dynamic disks, you can for example use the ldminfo utility

For Win2k and later dynamic disks, you can for example use the ldminfo utility

which is part of the Linux LDM tools (the latest version at the time of

which is part of the Linux LDM tools (the latest version at the time of

writing is linux-ldm-0.0.8.tar.bz2).  You can download it from:

writing is linux-ldm-0.0.8.tar.bz2).  You can download it from:

	http://linux-ntfs.sourceforge.net/downloads.html

	http://www.linux-ntfs.org/

Simply extract the downloaded archive (tar xvjf linux-ldm-0.0.8.tar.bz2), go

Simply extract the downloaded archive (tar xvjf linux-ldm-0.0.8.tar.bz2), go

into it (cd linux-ldm-0.0.8) and change to the test directory (cd test).  You

into it (cd linux-ldm-0.0.8) and change to the test directory (cd test).  You

will find the precompiled (i386) ldminfo utility there.  NOTE: You will not be

will find the precompiled (i386) ldminfo utility there.  NOTE: You will not be

Documentation/filesystems/proc.txt

+19 −0
Original line number Original line Diff line number Diff line
@@ -1339,6 +1339,25 @@ Enables/Disables the protection of the per-process proc entries "maps" and 
"smaps".  When enabled, the contents of these files are visible only to

"smaps".  When enabled, the contents of these files are visible only to

readers that are allowed to ptrace() the given process.

readers that are allowed to ptrace() the given process.





msgmni

------



Maximum number of message queue ids on the system.

This value scales to the amount of lowmem. It is automatically recomputed

upon memory add/remove or ipc namespace creation/removal.

When a value is written into this file, msgmni's value becomes fixed, i.e. it

is not recomputed anymore when one of the above events occurs.

Use auto_msgmni to change this behavior.



auto_msgmni

-----------



Enables/Disables automatic recomputing of msgmni upon memory add/remove or

upon ipc namespace creation/removal (see the msgmni description above).

Echoing "1" into this file enables msgmni automatic recomputing.

Echoing "0" turns it off.

auto_msgmni default value is 1.







2.4 /proc/sys/vm - The virtual memory subsystem

2.4 /proc/sys/vm - The virtual memory subsystem

-----------------------------------------------

-----------------------------------------------