Merge branch 'irq/for-block' of... (474b313d) · Commits · e / devices / android_kernel_oneplus_sm8150

.mailmap

+3 −0

Documentation/ABI/stable/sysfs-devices

+1 −1

Original line number	Original line	Diff line number	Diff line
	# Note: This documents additional properties of any device beyond what		# Note: This documents additional properties of any device beyond what
	# is documented in Documentation/sysfs-rules.txt		# is documented in Documentation/sysfs-rules.txt

	What: /sys/devices/*/of_path		What: /sys/devices/*/of_node
	Date: February 2015		Date: February 2015
	Contact: Device Tree mailing list <devicetree@vger.kernel.org>		Contact: Device Tree mailing list <devicetree@vger.kernel.org>
	Description:		Description:

Documentation/PCI/pci.txt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -124,7 +124,6 @@ initialization with a pointer to a structure describing the driver

	The ID table is an array of struct pci_device_id entries ending with an		The ID table is an array of struct pci_device_id entries ending with an
	all-zero entry. Definitions with static const are generally preferred.		all-zero entry. Definitions with static const are generally preferred.
	Use of the deprecated macro DEFINE_PCI_DEVICE_TABLE should be avoided.

	Each entry consists of:		Each entry consists of:

Documentation/arm/CCN.txt

+10 −6

Original line number	Original line	Diff line number	Diff line
	@@ -18,13 +18,17 @@ and config2 fields of the perf_event_attr structure. The "events"
	directory provides configuration templates for all documented		directory provides configuration templates for all documented
	events, that can be used with perf tool. For example "xp_valid_flit"		events, that can be used with perf tool. For example "xp_valid_flit"
	is an equivalent of "type=0x8,event=0x4". Other parameters must be		is an equivalent of "type=0x8,event=0x4". Other parameters must be
	explicitly specified. For events originating from device, "node"		explicitly specified.
	defines its index. All crosspoint events require "xp" (index),
	"port" (device port number) and "vc" (virtual channel ID) and
	"dir" (direction). Watchpoints (special "event" value 0xfe) also
	require comparator values ("cmp_l" and "cmp_h") and "mask", being
	index of the comparator mask.

			For events originating from device, "node" defines its index.

			Crosspoint PMU events require "xp" (index), "bus" (bus number)
			and "vc" (virtual channel ID).

			Crosspoint watchpoint-based events (special "event" value 0xfe)
			require "xp" and "vc" as as above plus "port" (device port index),
			"dir" (transmit/receive direction), comparator values ("cmp_l"
			and "cmp_h") and "mask", being index of the comparator mask.
	Masks are defined separately from the event description		Masks are defined separately from the event description
	(due to limited number of the config values) in the "cmp_mask"		(due to limited number of the config values) in the "cmp_mask"
	directory, with first 8 configurable by user and additional		directory, with first 8 configurable by user and additional

Documentation/cpu-freq/cpufreq-stats.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -103,7 +103,7 @@ Config Main Menu
	Power management options (ACPI, APM) --->		Power management options (ACPI, APM) --->
	CPU Frequency scaling --->		CPU Frequency scaling --->
	[*] CPU Frequency scaling		[*] CPU Frequency scaling
	<*> CPU frequency translation statistics		[*] CPU frequency translation statistics
	[*] CPU frequency translation statistics details		[*] CPU frequency translation statistics details

Original line number	Original line	Diff line number	Diff line
	@@ -88,6 +88,7 @@ Kay Sievers <kay.sievers@vrfy.org>
	Kenneth W Chen <kenneth.w.chen@intel.com>		Kenneth W Chen <kenneth.w.chen@intel.com>
	Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>		Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
	Koushik <raghavendra.koushik@neterion.com>		Koushik <raghavendra.koushik@neterion.com>
			Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
	Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>		Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
	Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>		Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
	Leonid I Ananiev <leonid.i.ananiev@intel.com>		Leonid I Ananiev <leonid.i.ananiev@intel.com>
	@@ -158,6 +159,8 @@ Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
	Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>		Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>
	Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>		Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>
	Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>		Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>
			Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
			Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
	Takashi YOSHII <takashi.yoshii.zj@renesas.com>		Takashi YOSHII <takashi.yoshii.zj@renesas.com>
	Yusuke Goda <goda.yusuke@renesas.com>		Yusuke Goda <goda.yusuke@renesas.com>
	Gustavo Padovan <gustavo@las.ic.unicamp.br>		Gustavo Padovan <gustavo@las.ic.unicamp.br>