Commit 2e515bf0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 

Pull trivial tree from Jiri Kosina:
 "The usual trivial updates all over the tree -- mostly typo fixes and
  documentation updates"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (52 commits)
  doc: Documentation/cputopology.txt fix typo
  treewide: Convert retrun typos to return
  Fix comment typo for init_cma_reserved_pageblock
  Documentation/trace: Correcting and extending tracepoint documentation
  mm/hotplug: fix a typo in Documentation/memory-hotplug.txt
  power: Documentation: Update s2ram link
  doc: fix a typo in Documentation/00-INDEX
  Documentation/printk-formats.txt: No casts needed for u64/s64
  doc: Fix typo "is is" in Documentations
  treewide: Fix printks with 0x%#
  zram: doc fixes
  Documentation/kmemcheck: update kmemcheck documentation
  doc: documentation/hwspinlock.txt fix typo
  PM / Hibernate: add section for resume options
  doc: filesystems : Fix typo in Documentations/filesystems
  scsi/megaraid fixed several typos in comments
  ppc: init_32: Fix error typo "CONFIG_START_KERNEL"
  treewide: Add __GFP_NOWARN to k.alloc calls with v.alloc fallbacks
  page_isolation: Fix a comment typo in test_pages_isolated()
  doc: fix a typo about irq affinity
  ...
parents 22e04f6b f8ea61e6

CREDITS

+5 −6
Original line number Diff line number Diff line
@@ -637,14 +637,13 @@ S: 14509 NE 39th Street #1096 
S: Bellevue, Washington 98007

S: USA



N: Christopher L. Cheney

E: ccheney@debian.org

E: ccheney@cheney.cx

W: http://www.cheney.cx

N: Chris Cheney

E: chris.cheney@gmail.com

E: ccheney@redhat.com

P: 1024D/8E384AF2 2D31 1927 87D7 1F24 9FF9  1BC5 D106 5AB3 8E38 4AF2

D: Vista Imaging usb webcam driver

S: 314 Prince of Wales

S: Conroe, TX 77304

S: 2308 Therrell Way

S: McKinney, TX 75070

S: USA



N: Stuart Cheshire

Documentation/00-INDEX

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ IPMI.txt 
IRQ-affinity.txt

	- how to select which CPU(s) handle which interrupt events on SMP.

IRQ-domain.txt

	- info on inerrupt numbering and setting up IRQ domains.

	- info on interrupt numbering and setting up IRQ domains.

IRQ.txt

	- description of what an IRQ is.

Intel-IOMMU.txt

Documentation/ABI/testing/sysfs-block-zram

+5 −4
Original line number Diff line number Diff line
@@ -5,20 +5,21 @@ Description: 
		The disksize file is read-write and specifies the disk size

		which represents the limit on the *uncompressed* worth of data

		that can be stored in this disk.

		Unit: bytes



What:		/sys/block/zram<id>/initstate

Date:		August 2010

Contact:	Nitin Gupta <ngupta@vflare.org>

Description:

		The disksize file is read-only and shows the initialization

		The initstate file is read-only and shows the initialization

		state of the device.



What:		/sys/block/zram<id>/reset

Date:		August 2010

Contact:	Nitin Gupta <ngupta@vflare.org>

Description:

		The disksize file is write-only and allows resetting the

		device. The reset operation frees all the memory assocaited

		The reset file is write-only and allows resetting the

		device. The reset operation frees all the memory associated

		with this device.



What:		/sys/block/zram<id>/num_reads
@@ -48,7 +49,7 @@ Contact: Nitin Gupta <ngupta@vflare.org> 
Description:

		The notify_free file is read-only and specifies the number of

		swap slot free notifications received by this device. These

		notifications are send to a swap block device when a swap slot

		notifications are sent to a swap block device when a swap slot

		is freed. This statistic is applicable only when this disk is

		being used as a swap disk.

Documentation/DocBook/media/v4l/vidioc-g-parm.xml

+2 −2
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ devices.</para> 
	  <row>

	    <entry>&v4l2-fract;</entry>

	    <entry><structfield>timeperframe</structfield></entry>

	    <entry><para>This is is the desired period between

	    <entry><para>This is the desired period between

successive frames captured by the driver, in seconds. The

field is intended to skip frames on the driver side, saving I/O

bandwidth.</para><para>Applications store here the desired frame
@@ -193,7 +193,7 @@ applications must set the array to zero.</entry> 
	  <row>

	    <entry>&v4l2-fract;</entry>

	    <entry><structfield>timeperframe</structfield></entry>

	    <entry>This is is the desired period between

	    <entry>This is the desired period between

successive frames output by the driver, in seconds.</entry>

	  </row>

	  <row>

Documentation/IRQ-affinity.txt

+2 −2
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ i.e counters for the CPU0-3 did not change. 


Here is an example of limiting that same irq (44) to cpus 1024 to 1031:



[root@moon 44]# echo 1024-1031 > smp_affinity

[root@moon 44]# cat smp_affinity

[root@moon 44]# echo 1024-1031 > smp_affinity_list

[root@moon 44]# cat smp_affinity_list

1024-1031



Note that to do this with a bitmask would require 32 bitmasks of zero

CRA Git | Maintained and supported by SUSTech CRA and CCSE