Merge tag 'v3.16-rc5' into timers/core (afdb0943) · Commits · e / devices / android_kernel_xiaomi_markw

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

+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

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)

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -169,6 +169,14 @@ Description:
		"unknown", "notpresent", "down", "lowerlayerdown", "testing",
		"dormant", "up".

		What: /sys/class/net/<iface>/phys_port_id
		Date: July 2013
		KernelVersion: 3.12
		Contact: netdev@vger.kernel.org
		Description:
		Indicates the interface unique physical port identifier within
		the NIC, as a string.

		What: /sys/class/net/<iface>/speed
		Date: October 2009
		KernelVersion: 2.6.33