From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 16 Jul 2007 17:48:20 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=14dc5249728ff699b1ca4dac01ad416a350a147a;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block:
  splice: direct splicing updates ppos twice
  more ACSI removal
  umem: Fix match of pci_ids in umem driver
  umem: Remove references to dead CONFIG_MM_MAP_MEMORY variable
  remove the documentation for the legacy CDROM drivers
---

14dc5249728ff699b1ca4dac01ad416a350a147a
diff --cc Documentation/kernel-parameters.txt
index 789f97ac22bf,3078f14830dd..8363ad3ba018
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -1579,33 -1532,26 +1549,29 @@@ and is between 256 and 4096 characters
  	simeth=		[IA-64]
  	simscsi=
  
- 	sjcd=		[HW,CD]
- 			Format: <io>,<irq>,<dma>
- 			See header of drivers/cdrom/sjcd.c.
- 
  	slram=		[HW,MTD]
  
 -	slub_debug	[MM, SLUB]
 -			Enabling slub_debug allows one to determine the culprit
 -			if slab objects become corrupted. Enabling slub_debug
 -			creates guard zones around objects and poisons objects
 -			when not in use. Also tracks the last alloc / free.
 -			For more information see Documentation/vm/slub.txt.
 +	slub_debug[=options[,slabs]]	[MM, SLUB]
 +			Enabling slub_debug allows one to determine the
 +			culprit if slab objects become corrupted. Enabling
 +			slub_debug can create guard zones around objects and
 +			may poison objects when not in use. Also tracks the
 +			last alloc / free. For more information see
 +			Documentation/vm/slub.txt.
  
  	slub_max_order= [MM, SLUB]
 -			Determines the maximum allowed order for slabs. Setting
 -			this too high may cause fragmentation.
 -			For more information see Documentation/vm/slub.txt.
 +			Determines the maximum allowed order for slabs.
 +			A high setting may cause OOMs due to memory
 +			fragmentation. For more information see
 +			Documentation/vm/slub.txt.
  
  	slub_min_objects=	[MM, SLUB]
 -			The minimum objects per slab. SLUB will increase the
 -			slab order up to slub_max_order to generate a
 -			sufficiently big slab to satisfy the number of objects.
 -			The higher the number of objects the smaller the overhead
 -			of tracking slabs.
 +			The minimum number of objects per slab. SLUB will
 +			increase the slab order up to slub_max_order to
 +			generate a sufficiently large slab able to contain
 +			the number of objects indicated. The higher the number
 +			of objects the smaller the overhead of tracking slabs
 +			and the less frequently locks need to be acquired.
  			For more information see Documentation/vm/slub.txt.
  
  	slub_min_order=	[MM, SLUB]