Merge drm/drm-fixes into drm-misc-fixes (77fdaa09) · Commits · e / devices / android_kernel_fairphone_FP5

.clang-format

+14 −3

Original line number	Diff line number	Diff line
		@@ -107,10 +107,13 @@ ForEachMacros:
		- 'css_for_each_descendant_post'
		- 'css_for_each_descendant_pre'
		- 'device_for_each_child_node'
		- 'dma_fence_chain_for_each'
		- 'drm_atomic_crtc_for_each_plane'
		- 'drm_atomic_crtc_state_for_each_plane'
		- 'drm_atomic_crtc_state_for_each_plane_state'
		- 'drm_atomic_for_each_plane_damage'
		- 'drm_client_for_each_connector_iter'
		- 'drm_client_for_each_modeset'
		- 'drm_connector_for_each_possible_encoder'
		- 'drm_for_each_connector_iter'
		- 'drm_for_each_crtc'
		@@ -126,6 +129,7 @@ ForEachMacros:
		- 'drm_mm_for_each_node_in_range'
		- 'drm_mm_for_each_node_safe'
		- 'flow_action_for_each'
		- 'for_each_active_dev_scope'
		- 'for_each_active_drhd_unit'
		- 'for_each_active_iommu'
		- 'for_each_available_child_of_node'
		@@ -153,6 +157,8 @@ ForEachMacros:
		- 'for_each_cpu_not'
		- 'for_each_cpu_wrap'
		- 'for_each_dev_addr'
		- 'for_each_dev_scope'
		- 'for_each_displayid_db'
		- 'for_each_dma_cap_mask'
		- 'for_each_dpcm_be'
		- 'for_each_dpcm_be_rollback'
		@@ -169,6 +175,8 @@ ForEachMacros:
		- 'for_each_evictable_lru'
		- 'for_each_fib6_node_rt_rcu'
		- 'for_each_fib6_walker_rt'
		- 'for_each_free_mem_pfn_range_in_zone'
		- 'for_each_free_mem_pfn_range_in_zone_from'
		- 'for_each_free_mem_range'
		- 'for_each_free_mem_range_reverse'
		- 'for_each_func_rsrc'
		@@ -178,6 +186,7 @@ ForEachMacros:
		- 'for_each_ip_tunnel_rcu'
		- 'for_each_irq_nr'
		- 'for_each_link_codecs'
		- 'for_each_link_platforms'
		- 'for_each_lru'
		- 'for_each_matching_node'
		- 'for_each_matching_node_and_match'
		@@ -302,7 +311,10 @@ ForEachMacros:
		- 'ide_port_for_each_present_dev'
		- 'idr_for_each_entry'
		- 'idr_for_each_entry_continue'
		- 'idr_for_each_entry_continue_ul'
		- 'idr_for_each_entry_ul'
		- 'in_dev_for_each_ifa_rcu'
		- 'in_dev_for_each_ifa_rtnl'
		- 'inet_bind_bucket_for_each'
		- 'inet_lhash2_for_each_icsk_rcu'
		- 'key_for_each'
		@@ -343,8 +355,6 @@ ForEachMacros:
		- 'media_device_for_each_intf'
		- 'media_device_for_each_link'
		- 'media_device_for_each_pad'
		- 'mp_bvec_for_each_page'
		- 'mp_bvec_for_each_segment'
		- 'nanddev_io_for_each_page'
		- 'netdev_for_each_lower_dev'
		- 'netdev_for_each_lower_private'
		@@ -381,18 +391,19 @@ ForEachMacros:
		- 'radix_tree_for_each_slot'
		- 'radix_tree_for_each_tagged'
		- 'rbtree_postorder_for_each_entry_safe'
		- 'rdma_for_each_block'
		- 'rdma_for_each_port'
		- 'resource_list_for_each_entry'
		- 'resource_list_for_each_entry_safe'
		- 'rhl_for_each_entry_rcu'
		- 'rhl_for_each_rcu'
		- 'rht_for_each'
		- 'rht_for_each_from'
		- 'rht_for_each_entry'
		- 'rht_for_each_entry_from'
		- 'rht_for_each_entry_rcu'
		- 'rht_for_each_entry_rcu_from'
		- 'rht_for_each_entry_safe'
		- 'rht_for_each_from'
		- 'rht_for_each_rcu'
		- 'rht_for_each_rcu_from'
		- '__rq_for_each_bio'

.gitignore

+2 −1

Original line number	Diff line number	Diff line
		@@ -32,9 +32,9 @@
		*.lzo
		*.mod
		*.mod.c
		*.ns_deps
		*.o
		.o.
		*.order
		*.patch
		*.s
		*.so
		@@ -46,6 +46,7 @@
		*.xz
		Module.symvers
		modules.builtin
		modules.order

		#
		# Top-level generic files

.mailmap

+21 −5

Original line number	Diff line number	Diff line
		@@ -47,6 +47,8 @@ Boris Brezillon <bbrezillon@kernel.org> <b.brezillon.dev@gmail.com>
		Boris Brezillon <bbrezillon@kernel.org> <b.brezillon@overkiz.com>
		Brian Avery <b.avery@hp.com>
		Brian King <brking@us.ibm.com>
		Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>
		Chao Yu <chao@kernel.org> <yuchao0@huawei.com>
		Christoph Hellwig <hch@lst.de>
		Christophe Ricard <christophe.ricard@gmail.com>
		Corey Minyard <minyard@acm.org>
		@@ -63,7 +65,11 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>
		Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>
		Dengcheng Zhu <dzhu@wavecomp.com> <dczhu@mips.com>
		Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>
		<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>
		Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
		Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>
		Dmitry Safonov <0x7f454c46@gmail.com> <d.safonov@partner.samsung.com>
		Dmitry Safonov <0x7f454c46@gmail.com> <dima@arista.com>
		Domen Puncer <domen@coderock.org>
		Douglas Gilbert <dougg@torque.net>
		Ed L. Cashin <ecashin@coraid.com>
		@@ -77,6 +83,8 @@ Frank Rowand <frowand.list@gmail.com> <frowand@mvista.com>
		Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>
		Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>
		Frank Zago <fzago@systemfabricworks.com>
		Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com>
		Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>
		Greg Kroah-Hartman <greg@echidna.(none)>
		Greg Kroah-Hartman <gregkh@suse.de>
		Greg Kroah-Hartman <greg@kroah.com>
		@@ -87,6 +95,9 @@ Henrik Kretzschmar <henne@nachtwindheim.de>
		Henrik Rydberg <rydberg@bitmath.org>
		Herbert Xu <herbert@gondor.apana.org.au>
		Jacob Shin <Jacob.Shin@amd.com>
		Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@google.com>
		Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@motorola.com>
		Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk.kim@samsung.com>
		James Bottomley <jejb@mulgrave.(none)>
		James Bottomley <jejb@titanic.il.steeleye.com>
		James E Wilson <wilson@specifix.com>
		@@ -160,6 +171,8 @@ Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.co
		Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>
		Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>
		Matt Redfearn <matt.redfearn@mips.com> <matt.redfearn@imgtec.com>
		Maxime Ripard <mripard@kernel.org> <maxime.ripard@bootlin.com>
		Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>
		Mayuresh Janorkar <mayur@ti.com>
		Michael Buesch <m@bues.ch>
		Michel Dänzer <michel@tungstengraphics.com>
		@@ -173,8 +186,14 @@ Morten Welinder <welinder@darter.rentec.com>
		Morten Welinder <welinder@troll.com>
		Mythri P K <mythripk@ti.com>
		Nguyen Anh Quynh <aquynh@gmail.com>
		Nicolas Ferre <nicolas.ferre@microchip.com> <nicolas.ferre@atmel.com>
		Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>
		Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>
		Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>
		Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>
		Oleksij Rempel <linux@rempel-privat.de> <fixed-term.Oleksij.Rempel@de.bosch.com>
		Oleksij Rempel <linux@rempel-privat.de> <o.rempel@pengutronix.de>
		Oleksij Rempel <linux@rempel-privat.de> <ore@pengutronix.de>
		Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
		Patrick Mochel <mochel@digitalimplant.org>
		Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
		@@ -185,11 +204,7 @@ Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>
		Praveen BP <praveenbp@ti.com>
		Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>
		Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>
		Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>
		Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>
		Oleksij Rempel <linux@rempel-privat.de> <fixed-term.Oleksij.Rempel@de.bosch.com>
		Oleksij Rempel <linux@rempel-privat.de> <o.rempel@pengutronix.de>
		Oleksij Rempel <linux@rempel-privat.de> <ore@pengutronix.de>
		Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>
		Rajesh Shah <rajesh.shah@intel.com>
		Ralf Baechle <ralf@linux-mips.org>
		Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
		@@ -224,6 +239,7 @@ Sumit Semwal <sumit.semwal@ti.com>
		Tejun Heo <htejun@gmail.com>
		Thomas Graf <tgraf@suug.ch>
		Thomas Pedersen <twp@codeaurora.org>
		Todor Tomov <todor.too@gmail.com> <todor.tomov@linaro.org>
		Tony Luck <tony.luck@intel.com>
		TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>
		TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>

CREDITS

+1 −1

Original line number	Diff line number	Diff line
		@@ -751,7 +751,7 @@ S: Santa Cruz, California
		S: USA

		N: Luis Correia
		E: lfcorreia@users.sf.net
		E: luisfcorreia@gmail.com
		D: Ralink rt2x00 WLAN driver
		S: Belas, Portugal

Documentation/ABI/stable/sysfs-bus-w1

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,6 +6,6 @@ Description: Bus scanning interval, microseconds component.
		control systems are attached/generate presence for as short as
		100 ms - hence the tens-to-hundreds milliseconds scan intervals
		are required.
		see Documentation/w1/w1.generic for detailed information.
		see Documentation/w1/w1-generic.rst for detailed information.
		Users: any user space application which wants to know bus scanning
		interval