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

Commit 32032df6 authored by Tejun Heo's avatar Tejun Heo
Browse files

Merge branch 'master' into percpu

Conflicts:
	arch/powerpc/platforms/pseries/hvCall.S
	include/linux/percpu.h
parents 22b737f4 c5974b83
Loading
Loading
Loading
Loading
+2 −6
Original line number Diff line number Diff line
@@ -22,9 +22,11 @@
*.lst
*.symtypes
*.order
modules.builtin
*.elf
*.bin
*.gz
*.bz2
*.lzma
*.patch
*.gcno
@@ -44,14 +46,8 @@ Module.symvers
#
# Generated include files
#
include/asm
include/asm-*/asm-offsets.h
include/config
include/linux/autoconf.h
include/linux/compile.h
include/linux/version.h
include/linux/utsrelease.h
include/linux/bounds.h
include/generated

# stgit generated dirs
+8 −0
Original line number Diff line number Diff line
What:		/sys/bus/pci/drivers/qla2xxx/.../devices/*
Date:		September 2009
Contact:	QLogic Linux Driver <linux-driver@qlogic.com>
Description:	qla2xxx-udev.sh currently looks for uevent CHANGE events to
		signal a firmware-dump has been generated by the driver and is
		ready for retrieval.
Users:		qla2xxx-udev.sh.  Proposed changes should be mailed to
		linux-driver@qlogic.com
+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Description:
		 1 - major number
		 2 - minor mumber
		 3 - device name
		 4 - reads completed succesfully
		 4 - reads completed successfully
		 5 - reads merged
		 6 - sectors read
		 7 - time spent reading (ms)
+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ Contact: Jerome Marchand <jmarchan@redhat.com>
Description:
		The /sys/block/<disk>/stat files displays the I/O
		statistics of disk <disk>. They contain 11 fields:
		 1 - reads completed succesfully
		 1 - reads completed successfully
		 2 - reads merged
		 3 - sectors read
		 4 - time spent reading (ms)
+28 −0
Original line number Diff line number Diff line
@@ -31,3 +31,31 @@ Date: March 2009
Kernel Version: 2.6.30
Contact:	iss_storagedev@hp.com
Description:	A symbolic link to /sys/block/cciss!cXdY

Where:		/sys/bus/pci/devices/<dev>/ccissX/rescan
Date:		August 2009
Kernel Version:	2.6.31
Contact:	iss_storagedev@hp.com
Description:	Kicks of a rescan of the controller to discover logical
		drive topology changes.

Where:		/sys/bus/pci/devices/<dev>/ccissX/cXdY/lunid
Date:		August 2009
Kernel Version: 2.6.31
Contact:	iss_storagedev@hp.com
Description:	Displays the 8-byte LUN ID used to address logical
		drive Y of controller X.

Where:		/sys/bus/pci/devices/<dev>/ccissX/cXdY/raid_level
Date:		August 2009
Kernel Version: 2.6.31
Contact:	iss_storagedev@hp.com
Description:	Displays the RAID level of logical drive Y of
		controller X.

Where:		/sys/bus/pci/devices/<dev>/ccissX/cXdY/usage_count
Date:		August 2009
Kernel Version: 2.6.31
Contact:	iss_storagedev@hp.com
Description:	Displays the usage count (number of opens) of logical drive Y
		of controller X.
Loading