Merge branch 'next' into for-linus (59747372) · Commits · e / devices / android_kernel_fairphone_FP5

.clang-format

+68 −2

Original line number	Diff line number	Diff line
		@@ -72,8 +72,14 @@ ForEachMacros:
		- 'apei_estatus_for_each_section'
		- 'ata_for_each_dev'
		- 'ata_for_each_link'
		- '__ata_qc_for_each'
		- 'ata_qc_for_each'
		- 'ata_qc_for_each_raw'
		- 'ata_qc_for_each_with_internal'
		- 'ax25_for_each'
		- 'ax25_uid_for_each'
		- '__bio_for_each_bvec'
		- 'bio_for_each_bvec'
		- 'bio_for_each_integrity_vec'
		- '__bio_for_each_segment'
		- 'bio_for_each_segment'
		@@ -85,6 +91,7 @@ ForEachMacros:
		- 'blk_queue_for_each_rl'
		- 'bond_for_each_slave'
		- 'bond_for_each_slave_rcu'
		- 'bpf_for_each_spilled_reg'
		- 'btree_for_each_safe128'
		- 'btree_for_each_safe32'
		- 'btree_for_each_safe64'
		@@ -103,6 +110,8 @@ ForEachMacros:
		- '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_connector_for_each_possible_encoder'
		- 'drm_for_each_connector_iter'
		- 'drm_for_each_crtc'
		- 'drm_for_each_encoder'
		@@ -111,21 +120,33 @@ ForEachMacros:
		- 'drm_for_each_legacy_plane'
		- 'drm_for_each_plane'
		- 'drm_for_each_plane_mask'
		- 'drm_for_each_privobj'
		- 'drm_mm_for_each_hole'
		- 'drm_mm_for_each_node'
		- 'drm_mm_for_each_node_in_range'
		- 'drm_mm_for_each_node_safe'
		- 'flow_action_for_each'
		- 'for_each_active_drhd_unit'
		- 'for_each_active_iommu'
		- 'for_each_available_child_of_node'
		- 'for_each_bio'
		- 'for_each_board_func_rsrc'
		- 'for_each_bvec'
		- 'for_each_card_components'
		- 'for_each_card_links'
		- 'for_each_card_links_safe'
		- 'for_each_card_prelinks'
		- 'for_each_card_rtds'
		- 'for_each_card_rtds_safe'
		- 'for_each_cgroup_storage_type'
		- 'for_each_child_of_node'
		- 'for_each_clear_bit'
		- 'for_each_clear_bit_from'
		- 'for_each_cmsghdr'
		- 'for_each_compatible_node'
		- 'for_each_component_dais'
		- 'for_each_component_dais_safe'
		- 'for_each_comp_order'
		- 'for_each_console'
		- 'for_each_cpu'
		- 'for_each_cpu_and'
		@@ -133,10 +154,17 @@ ForEachMacros:
		- 'for_each_cpu_wrap'
		- 'for_each_dev_addr'
		- 'for_each_dma_cap_mask'
		- 'for_each_dpcm_be'
		- 'for_each_dpcm_be_rollback'
		- 'for_each_dpcm_be_safe'
		- 'for_each_dpcm_fe'
		- 'for_each_drhd_unit'
		- 'for_each_dss_dev'
		- 'for_each_efi_memory_desc'
		- 'for_each_efi_memory_desc_in_map'
		- 'for_each_element'
		- 'for_each_element_extid'
		- 'for_each_element_id'
		- 'for_each_endpoint_of_node'
		- 'for_each_evictable_lru'
		- 'for_each_fib6_node_rt_rcu'
		@@ -149,6 +177,7 @@ ForEachMacros:
		- 'for_each_iommu'
		- 'for_each_ip_tunnel_rcu'
		- 'for_each_irq_nr'
		- 'for_each_link_codecs'
		- 'for_each_lru'
		- 'for_each_matching_node'
		- 'for_each_matching_node_and_match'
		@@ -160,6 +189,7 @@ ForEachMacros:
		- 'for_each_mem_range_rev'
		- 'for_each_migratetype_order'
		- 'for_each_msi_entry'
		- 'for_each_msi_entry_safe'
		- 'for_each_net'
		- 'for_each_netdev'
		- 'for_each_netdev_continue'
		@@ -172,6 +202,7 @@ ForEachMacros:
		- 'for_each_net_rcu'
		- 'for_each_new_connector_in_state'
		- 'for_each_new_crtc_in_state'
		- 'for_each_new_mst_mgr_in_state'
		- 'for_each_new_plane_in_state'
		- 'for_each_new_private_obj_in_state'
		- 'for_each_node'
		@@ -183,12 +214,16 @@ ForEachMacros:
		- 'for_each_node_with_property'
		- 'for_each_of_allnodes'
		- 'for_each_of_allnodes_from'
		- 'for_each_of_cpu_node'
		- 'for_each_of_pci_range'
		- 'for_each_old_connector_in_state'
		- 'for_each_old_crtc_in_state'
		- 'for_each_old_mst_mgr_in_state'
		- 'for_each_oldnew_connector_in_state'
		- 'for_each_oldnew_crtc_in_state'
		- 'for_each_oldnew_mst_mgr_in_state'
		- 'for_each_oldnew_plane_in_state'
		- 'for_each_oldnew_plane_in_state_reverse'
		- 'for_each_oldnew_private_obj_in_state'
		- 'for_each_old_plane_in_state'
		- 'for_each_old_private_obj_in_state'
		@@ -206,14 +241,21 @@ ForEachMacros:
		- 'for_each_process'
		- 'for_each_process_thread'
		- 'for_each_property_of_node'
		- 'for_each_registered_fb'
		- 'for_each_reserved_mem_region'
		- 'for_each_resv_unavail_range'
		- 'for_each_rtd_codec_dai'
		- 'for_each_rtd_codec_dai_rollback'
		- 'for_each_rtdcom'
		- 'for_each_rtdcom_safe'
		- '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_subelement'
		- 'for_each_subelement_extid'
		- 'for_each_subelement_id'
		- '__for_each_thread'
		- 'for_each_thread'
		- 'for_each_zone'
		@@ -223,6 +265,8 @@ ForEachMacros:
		- 'fwnode_for_each_child_node'
		- 'fwnode_graph_for_each_endpoint'
		- 'gadget_for_each_ep'
		- 'genradix_for_each'
		- 'genradix_for_each_from'
		- 'hash_for_each'
		- 'hash_for_each_possible'
		- 'hash_for_each_possible_rcu'
		@@ -251,6 +295,8 @@ ForEachMacros:
		- 'hlist_nulls_for_each_entry_from'
		- 'hlist_nulls_for_each_entry_rcu'
		- 'hlist_nulls_for_each_entry_safe'
		- 'i3c_bus_for_each_i2cdev'
		- 'i3c_bus_for_each_i3cdev'
		- 'ide_host_for_each_port'
		- 'ide_port_for_each_dev'
		- 'ide_port_for_each_present_dev'
		@@ -259,19 +305,25 @@ 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'
		- 'klp_for_each_func_safe'
		- 'klp_for_each_func_static'
		- 'klp_for_each_object'
		- 'klp_for_each_object_safe'
		- 'klp_for_each_object_static'
		- 'kvm_for_each_memslot'
		- 'kvm_for_each_vcpu'
		- 'list_for_each'
		- 'list_for_each_codec'
		- 'list_for_each_codec_safe'
		- 'list_for_each_entry'
		- 'list_for_each_entry_continue'
		- 'list_for_each_entry_continue_rcu'
		- 'list_for_each_entry_continue_reverse'
		- 'list_for_each_entry_from'
		- 'list_for_each_entry_from_rcu'
		- 'list_for_each_entry_from_reverse'
		- 'list_for_each_entry_lockless'
		- 'list_for_each_entry_rcu'
		@@ -291,6 +343,9 @@ 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'
		- 'netdev_for_each_lower_private_rcu'
		@@ -326,6 +381,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'
		@@ -340,6 +396,7 @@ ForEachMacros:
		- 'rht_for_each_rcu'
		- 'rht_for_each_rcu_continue'
		- '__rq_for_each_bio'
		- 'rq_for_each_bvec'
		- 'rq_for_each_segment'
		- 'scsi_for_each_prot_sg'
		- 'scsi_for_each_sg'
		@@ -357,12 +414,14 @@ ForEachMacros:
		- 'sk_nulls_for_each'
		- 'sk_nulls_for_each_from'
		- 'sk_nulls_for_each_rcu'
		- 'snd_array_for_each'
		- 'snd_pcm_group_for_each_entry'
		- 'snd_soc_dapm_widget_for_each_path'
		- 'snd_soc_dapm_widget_for_each_path_safe'
		- 'snd_soc_dapm_widget_for_each_sink_path'
		- 'snd_soc_dapm_widget_for_each_source_path'
		- 'tb_property_for_each'
		- 'tcf_exts_for_each_action'
		- 'udp_portaddr_for_each_entry'
		- 'udp_portaddr_for_each_entry_rcu'
		- 'usb_hub_for_each_child'
		@@ -371,6 +430,13 @@ ForEachMacros:
		- 'v4l2_m2m_for_each_dst_buf_safe'
		- 'v4l2_m2m_for_each_src_buf'
		- 'v4l2_m2m_for_each_src_buf_safe'
		- 'virtio_device_for_each_vq'
		- 'xa_for_each'
		- 'xa_for_each_marked'
		- 'xa_for_each_start'
		- 'xas_for_each'
		- 'xas_for_each_conflict'
		- 'xas_for_each_marked'
		- 'zorro_for_each_dev'

		#IncludeBlocks: Preserve # Unknown to clang-format-5.0

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		*.bin
		*.bz2
		.c.[012].*
		*.dt.yaml
		*.dtb
		*.dtb.S
		*.dwo

.mailmap

+13 −4

Original line number	Diff line number	Diff line
		@@ -36,9 +36,10 @@ Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>
		Ben Gardner <bgardner@wabtec.com>
		Ben M Cahill <ben.m.cahill@intel.com>
		Björn Steinbrink <B.Steinbrink@gmx.de>
		Boris Brezillon <boris.brezillon@bootlin.com> <boris.brezillon@free-electrons.com>
		Boris Brezillon <boris.brezillon@bootlin.com> <b.brezillon.dev@gmail.com>
		Boris Brezillon <boris.brezillon@bootlin.com> <b.brezillon@overkiz.com>
		Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com>
		Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com>
		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>
		Christoph Hellwig <hch@lst.de>
		@@ -47,7 +48,10 @@ Corey Minyard <minyard@acm.org>
		Damian Hobson-Garcia <dhobsong@igel.co.jp>
		David Brownell <david-b@pacbell.net>
		David Woodhouse <dwmw2@shinybook.infradead.org>
		Deng-Cheng Zhu <dengcheng.zhu@mips.com> <dengcheng.zhu@imgtec.com>
		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>
		Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
		Domen Puncer <domen@coderock.org>
		Douglas Gilbert <dougg@torque.net>
		@@ -119,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>
		@@ -151,6 +156,8 @@ Morten Welinder <welinder@darter.rentec.com>
		Morten Welinder <welinder@troll.com>
		Mythri P K <mythripk@ti.com>
		Nguyen Anh Quynh <aquynh@gmail.com>
		Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>
		Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>
		Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
		Patrick Mochel <mochel@digitalimplant.org>
		Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
		@@ -219,3 +226,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

+16 −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
		@@ -2208,6 +2207,12 @@ N: Christopher Li
		E: sparse@chrisli.org
		D: Sparse maintainer 2009 - 2018

		N: Shaohua Li
		D: Worked on many parts of the kernel, from core x86, ACPI, PCI, KVM, MM,
		D: and much more. He was the maintainer of MD from 2016 to 2018. Shaohua
		D: passed away late 2018, he will be greatly missed.
		W: https://www.spinics.net/lists/raid/msg61993.html

		N: Stephan Linz
		E: linz@mazet.de
		E: Stephan.Linz@gmx.de
		@@ -2486,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
		@@ -3774,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/