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

Commit b7e56edb authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'linus' into x86/mm 



x86/mm is on 32-rc4 and missing the spinlock namespace changes which
are needed for further commits into this topic.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parents 13ca0fca b0483e78

.gitignore

+3 −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
@@ -35,6 +37,7 @@ 
tags

TAGS

vmlinux

vmlinuz

System.map

Module.markers

Module.symvers
@@ -44,14 +47,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

Documentation/ABI/stable/sysfs-driver-qla2xxx

0 → 100644
+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

Documentation/ABI/testing/ima_policy

+6 −6
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ Description: 
			lsm:	[[subj_user=] [subj_role=] [subj_type=]

				 [obj_user=] [obj_role=] [obj_type=]]



		base: 	func:= [BPRM_CHECK][FILE_MMAP][INODE_PERMISSION]

		base: 	func:= [BPRM_CHECK][FILE_MMAP][FILE_CHECK]

			mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC]

			fsmagic:= hex value

			uid:= decimal value
@@ -40,11 +40,11 @@ Description: 


			measure func=BPRM_CHECK

			measure func=FILE_MMAP mask=MAY_EXEC

			measure func=INODE_PERM mask=MAY_READ uid=0

			measure func=FILE_CHECK mask=MAY_READ uid=0



		The default policy measures all executables in bprm_check,

		all files mmapped executable in file_mmap, and all files

		open for read by root in inode_permission.

		open for read by root in do_filp_open.



		Examples of LSM specific definitions:
@@ -54,8 +54,8 @@ Description: 


			dont_measure obj_type=var_log_t

			dont_measure obj_type=auditd_log_t

			measure subj_user=system_u func=INODE_PERM mask=MAY_READ

			measure subj_role=system_r func=INODE_PERM mask=MAY_READ

			measure subj_user=system_u func=FILE_CHECK mask=MAY_READ

			measure subj_role=system_r func=FILE_CHECK mask=MAY_READ



		Smack:

			measure subj_user=_ func=INODE_PERM mask=MAY_READ
 
			measure subj_user=_ func=FILE_CHECK mask=MAY_READ

Documentation/ABI/testing/procfs-diskstats

+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)

Documentation/ABI/testing/sysfs-block

+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)