Merge tag 'v3.16-rc4' into drm-intel-next-queued (f1615bbe) · Commits · 戴 / test

.gitignore

+2 −2

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@
		*.lst
		*.symtypes
		*.order
		modules.builtin
		*.elf
		*.bin
		*.gz
		@@ -33,6 +32,8 @@ modules.builtin
		*.lzo
		*.patch
		*.gcno
		modules.builtin
		Module.symvers

		#
		# Top-level generic files
		@@ -44,7 +45,6 @@ modules.builtin
		/vmlinuz
		/System.map
		/Module.markers
		/Module.symvers

		#
		# Debian directory (make deb-pkg)

CREDITS

+4 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,10 @@
		Linus
		----------

		M: Matt Mackal
		E: mpm@selenic.com
		D: SLOB slab allocator

		N: Matti Aarnio
		E: mea@nic.funet.fi
		D: Alpha systems hacking, IPv6 and other network related stuff

Documentation/ABI/stable/sysfs-devices-system-cpu

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		What: /sys/devices/system/cpu/dscr_default
		Date: 13-May-2014
		KernelVersion: v3.15.0
		Contact:
		Description: Writes are equivalent to writing to
		/sys/devices/system/cpu/cpuN/dscr on all CPUs.
		Reads return the last written value or 0.
		This value is not a global default: it is a way to set
		all per-CPU defaults at the same time.
		Values: 64 bit unsigned integer (bit field)

		What: /sys/devices/system/cpu/cpu[0-9]+/dscr
		Date: 13-May-2014
		KernelVersion: v3.15.0
		Contact:
		Description: Default value for the Data Stream Control Register (DSCR) on
		a CPU.
		This default value is used when the kernel is executing and
		for any process that has not set the DSCR itself.
		If a process ever sets the DSCR (via direct access to the
		SPR) that value will be persisted for that process and used
		on any CPU where it executes (overriding the value described
		here).
		If set by a process it will be inherited by child processes.
		Values: 64 bit unsigned integer (bit field)

Documentation/ABI/testing/configfs-usb-gadget

+45 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,40 @@ KernelVersion: 3.11
		Description:
		This group contains functions available to this USB gadget.

		What: /config/usb-gadget/gadget/functions/<func>.<inst>/interface.<n>
		Date: May 2014
		KernelVersion: 3.16
		Description:
		This group contains "Feature Descriptors" specific for one
		gadget's USB interface or one interface group described
		by an IAD.

		The attributes:

		compatible_id - 8-byte string for "Compatible ID"
		sub_compatible_id - 8-byte string for "Sub Compatible ID"

		What: /config/usb-gadget/gadget/functions/<func>.<inst>/interface.<n>/<property>
		Date: May 2014
		KernelVersion: 3.16
		Description:
		This group contains "Extended Property Descriptors" specific for one
		gadget's USB interface or one interface group described
		by an IAD.

		The attributes:

		type - value 1..7 for interpreting the data
		1: unicode string
		2: unicode string with environment variable
		3: binary
		4: little-endian 32-bit
		5: big-endian 32-bit
		6: unicode string with a symbolic link
		7: multiple unicode strings
		data - blob of data to be interpreted depending on
		type

		What: /config/usb-gadget/gadget/strings
		Date: Jun 2013
		KernelVersion: 3.11
		@@ -79,3 +113,14 @@ Description:
		product - gadget's product description
		manufacturer - gadget's manufacturer description

		What: /config/usb-gadget/gadget/os_desc
		Date: May 2014
		KernelVersion: 3.16
		Description:
		This group contains "OS String" extension handling attributes.

		use - flag turning "OS Desctiptors" support on/off
		b_vendor_code - one-byte value used for custom per-device and
		per-interface requests
		qw_sign - an identifier to be reported as "OS String"
		proper

Documentation/ABI/testing/ima_policy

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ Description:
		[fowner]]
		lsm: [[subj_user=] [subj_role=] [subj_type=]
		[obj_user=] [obj_role=] [obj_type=]]
		option: [[appraise_type=]]
		option: [[appraise_type=]] [permit_directio]

		base: func:= [BPRM_CHECK][MMAP_CHECK][FILE_CHECK][MODULE_CHECK]
		mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC]

Admin message