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

Commit c6ee60b7 authored by Steve French's avatar Steve French
Browse files

Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git



Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parents 13298def c499ec24
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -457,6 +457,12 @@ ChangeLog

Note, a technical ChangeLog aimed at kernel hackers is in fs/ntfs/ChangeLog.

2.1.26:
	- Implement support for sector sizes above 512 bytes (up to the maximum
	  supported by NTFS which is 4096 bytes).
	- Enhance support for NTFS volumes which were supported by Windows but
	  not by Linux due to invalid attribute list attribute flags.
	- A few minor updates and bug fixes.
2.1.25:
	- Write support is now extended with write(2) being able to both
	  overwrite existing file data and to extend files.  Also, if a write
+9 −0
Original line number Diff line number Diff line
@@ -92,6 +92,15 @@ NodeList format is a comma-separated list of decimal numbers and ranges,
a range being two hyphen-separated decimal numbers, the smallest and
largest node numbers in the range.  For example, mpol=bind:0-3,5,7,9-15

Note that trying to mount a tmpfs with an mpol option will fail if the
running kernel does not support NUMA; and will fail if its nodelist
specifies a node >= MAX_NUMNODES.  If your system relies on that tmpfs
being mounted, but from time to time runs a kernel built without NUMA
capability (perhaps a safe recovery kernel), or configured to support
fewer nodes, then it is advisable to omit the mpol option from automatic
mount options.  It can be added later, when the tmpfs is already mounted
on MountPoint, by 'mount -o remount,mpol=Policy:NodeList MountPoint'.


To specify the initial root directory you can use the following mount
options:
+2 −0
Original line number Diff line number Diff line
@@ -1034,6 +1034,8 @@ running once the system is up.

	nomce		[IA-32] Machine Check Exception

	nomca		[IA-64] Disable machine check abort handling

	noresidual	[PPC] Don't use residual data on PReP machines.

	noresume	[SWSUSP] Disables resume and restores original swap
+4 −0
Original line number Diff line number Diff line
@@ -52,6 +52,10 @@ APICs
		 apicmaintimer. Useful when your PIT timer is totally
		 broken.

   disable_8254_timer / enable_8254_timer
		 Enable interrupt 0 timer routing over the 8254 in addition to over
	         the IO-APIC. The kernel tries to set a sensible default.

Early Console

   syntax: earlyprintk=vga
+1 −1
Original line number Diff line number Diff line
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 16
EXTRAVERSION =-rc4
EXTRAVERSION =-rc5
NAME=Sliding Snow Leopard

# *DOCUMENTATION*
Loading