Merge tag 'v5.1-rc3' of... (df768610) · Commits · e / devices / android_kernel_fairphone_FP5

.clang-format

+2 −1

Original line number	Diff line number	Diff line
		@@ -240,6 +240,7 @@ ForEachMacros:
		- 'for_each_set_bit'
		- 'for_each_set_bit_from'
		- 'for_each_sg'
		- 'for_each_sg_dma_page'
		- 'for_each_sg_page'
		- 'for_each_sibling_event'
		- '__for_each_thread'
		@@ -289,7 +290,6 @@ ForEachMacros:
		- 'idr_for_each_entry_ul'
		- 'inet_bind_bucket_for_each'
		- 'inet_lhash2_for_each_icsk_rcu'
		- 'iov_for_each'
		- 'key_for_each'
		- 'key_for_each_safe'
		- 'klp_for_each_func'
		@@ -360,6 +360,7 @@ ForEachMacros:
		- 'radix_tree_for_each_slot'
		- 'radix_tree_for_each_tagged'
		- 'rbtree_postorder_for_each_entry_safe'
		- 'rdma_for_each_port'
		- 'resource_list_for_each_entry'
		- 'resource_list_for_each_entry_safe'
		- 'rhl_for_each_entry_rcu'

.mailmap

+3 −0

Original line number	Diff line number	Diff line
		@@ -123,6 +123,7 @@ Mark Brown <broonie@sirena.org.uk>
		Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>
		Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
		Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
		Mathieu Othacehe <m.othacehe@gmail.com>
		Matthew Wilcox <willy@infradead.org> <matthew.r.wilcox@intel.com>
		Matthew Wilcox <willy@infradead.org> <matthew@wil.cx>
		Matthew Wilcox <willy@infradead.org> <mawilcox@linuxonhyperv.com>
		@@ -223,3 +224,5 @@ Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
		Yusuke Goda <goda.yusuke@renesas.com>
		Gustavo Padovan <gustavo@las.ic.unicamp.br>
		Gustavo Padovan <padovan@profusion.mobi>
		Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>
		Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>

CREDITS

+10 −12

Original line number	Diff line number	Diff line
		@@ -842,10 +842,9 @@ D: ax25-utils maintainer.

		N: Helge Deller
		E: deller@gmx.de
		E: hdeller@redhat.de
		D: PA-RISC Linux hacker, LASI-, ASP-, WAX-, LCD/LED-driver
		S: Schimmelsrain 1
		S: D-69231 Rauenberg
		W: http://www.parisc-linux.org/
		D: PA-RISC Linux architecture maintainer
		D: LASI-, ASP-, WAX-, LCD/LED-driver
		S: Germany

		N: Jean Delvare
		@@ -1222,7 +1221,7 @@ S: Brazil

		N: Oded Gabbay
		E: oded.gabbay@gmail.com
		D: AMD KFD maintainer
		D: HabanaLabs and AMD KFD maintainer
		S: 12 Shraga Raphaeli
		S: Petah-Tikva, 4906418
		S: Israel
		@@ -1361,7 +1360,7 @@ S: Stellenbosch, Western Cape
		S: South Africa

		N: Grant Grundler
		E: grundler@parisc-linux.org
		E: grantgrundler@gmail.com
		W: http://obmouse.sourceforge.net/
		W: http://www.parisc-linux.org/
		D: obmouse - rewrote Olivier Florent's Omnibook 600 "pop-up" mouse driver
		@@ -2492,7 +2491,7 @@ S: Syracuse, New York 13206
		S: USA

		N: Kyle McMartin
		E: kyle@parisc-linux.org
		E: kyle@mcmartin.ca
		D: Linux/PARISC hacker
		D: AD1889 sound driver
		S: Ottawa, Canada
		@@ -3780,14 +3779,13 @@ S: 21513 Conradia Ct
		S: Cupertino, CA 95014
		S: USA

		N: Thibaut Varene
		E: T-Bone@parisc-linux.org
		W: http://www.parisc-linux.org/~varenet/
		P: 1024D/B7D2F063 E67C 0D43 A75E 12A5 BB1C FA2F 1E32 C3DA B7D2 F063
		N: Thibaut Varène
		E: hacks+kernel@slashdirt.org
		W: http://hacks.slashdirt.org/
		D: PA-RISC port minion, PDC and GSCPS2 drivers, debuglocks and other bits
		D: Some ARM at91rm9200 bits, S1D13XXX FB driver, random patches here and there
		D: AD1889 sound driver
		S: Paris, France
		S: France

		N: Heikki Vatiainen
		E: hessu@cs.tut.fi

Documentation/ABI/obsolete/sysfs-class-dax

0 → 100644

+22 −0

Original line number	Diff line number	Diff line
		What: /sys/class/dax/
		Date: May, 2016
		KernelVersion: v4.7
		Contact: linux-nvdimm@lists.01.org
		Description: Device DAX is the device-centric analogue of Filesystem
		DAX (CONFIG_FS_DAX). It allows memory ranges to be
		allocated and mapped without need of an intervening file
		system. Device DAX is strict, precise and predictable.
		Specifically this interface:

		1/ Guarantees fault granularity with respect to a given
		page size (pte, pmd, or pud) set at configuration time.

		2/ Enforces deterministic behavior by being strict about
		what fault scenarios are supported.

		The /sys/class/dax/ interface enumerates all the
		device-dax instances in the system. The ABI is
		deprecated and will be removed after 2020. It is
		replaced with the DAX bus interface /sys/bus/dax/ where
		device-dax instances can be found under
		/sys/bus/dax/devices/

Documentation/ABI/stable/sysfs-bus-vmbus

+33 −0

Original line number	Diff line number	Diff line
		@@ -146,3 +146,36 @@ KernelVersion: 4.16
		Contact: Stephen Hemminger <sthemmin@microsoft.com>
		Description: Binary file created by uio_hv_generic for ring buffer
		Users: Userspace drivers

		What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/intr_in_full
		Date: February 2019
		KernelVersion: 5.0
		Contact: Michael Kelley <mikelley@microsoft.com>
		Description: Number of guest to host interrupts caused by the inbound ring
		buffer transitioning from full to not full while a packet is
		waiting for buffer space to become available
		Users: Debugging tools

		What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/intr_out_empty
		Date: February 2019
		KernelVersion: 5.0
		Contact: Michael Kelley <mikelley@microsoft.com>
		Description: Number of guest to host interrupts caused by the outbound ring
		buffer transitioning from empty to not empty
		Users: Debugging tools

		What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/out_full_first
		Date: February 2019
		KernelVersion: 5.0
		Contact: Michael Kelley <mikelley@microsoft.com>
		Description: Number of write operations that were the first to encounter an
		outbound ring buffer full condition
		Users: Debugging tools

		What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/out_full_total
		Date: February 2019
		KernelVersion: 5.0
		Contact: Michael Kelley <mikelley@microsoft.com>
		Description: Total number of write operations that encountered an outbound
		ring buffer full condition
		Users: Debugging tools