Merge branch 'fixes-dra7' into fixes (f29f24b5) · Commits · EulixOS / Software / Kernel

.clang-format

+28 −4

Original line number	Diff line number	Diff line
		@@ -78,6 +78,8 @@ ForEachMacros:
		- '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'
		@@ -118,10 +120,12 @@ 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'
		@@ -158,6 +162,9 @@ ForEachMacros:
		- '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'
		@@ -195,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'
		@@ -210,8 +218,10 @@ ForEachMacros:
		- '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'
		@@ -243,6 +253,9 @@ ForEachMacros:
		- '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'
		@@ -252,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'
		@@ -293,7 +308,11 @@ ForEachMacros:
		- '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'
		@@ -324,6 +343,8 @@ 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'
		@@ -366,15 +387,16 @@ ForEachMacros:
		- 'rhl_for_each_entry_rcu'
		- 'rhl_for_each_rcu'
		- 'rht_for_each'
		- 'rht_for_each_continue'
		- 'rht_for_each_from'
		- 'rht_for_each_entry'
		- 'rht_for_each_entry_continue'
		- 'rht_for_each_entry_from'
		- 'rht_for_each_entry_rcu'
		- 'rht_for_each_entry_rcu_continue'
		- 'rht_for_each_entry_rcu_from'
		- 'rht_for_each_entry_safe'
		- 'rht_for_each_rcu'
		- 'rht_for_each_rcu_continue'
		- 'rht_for_each_rcu_from'
		- '__rq_for_each_bio'
		- 'rq_for_each_bvec'
		- 'rq_for_each_segment'
		- 'scsi_for_each_prot_sg'
		- 'scsi_for_each_sg'
		@@ -410,6 +432,8 @@ ForEachMacros:
		- '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'

.get_maintainer.ignore

+1 −0

Original line number	Diff line number	Diff line
		Christoph Hellwig <hch@lst.de>
		Marc Gonzalez <marc.w.gonzalez@free.fr>

.gitignore

+16 −8

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@ modules.builtin
		/vmlinuz
		/System.map
		/Module.markers
		/modules.builtin.modinfo

		#
		# RPM spec file (make rpm-pkg)
		@@ -80,20 +81,22 @@ modules.builtin
		/tar-install/

		#
		# git files that we don't want to ignore even if they are dot-files
		# We don't want to ignore the following even if they are dot-files
		#
		!.clang-format
		!.cocciconfig
		!.get_maintainer.ignore
		!.gitattributes
		!.gitignore
		!.mailmap
		!.cocciconfig
		!.clang-format

		#
		# Generated include files
		#
		include/config
		include/generated
		include/ksym
		arch/*/include/generated
		/include/config/
		/include/generated/
		/include/ksym/
		/arch/*/include/generated/

		# stgit generated dirs
		patches-*
		@@ -129,7 +132,12 @@ signing_key.x509
		x509.genkey

		# Kconfig presets
		all.config
		/all.config
		/alldef.config
		/allmod.config
		/allno.config
		/allrandom.config
		/allyes.config

		# Kdevelop4
		*.kdev4

.mailmap

+20 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,11 @@ Alan Cox <alan@lxorguk.ukuu.org.uk>
		Alan Cox <root@hraefn.swansea.linux.org.uk>
		Aleksey Gorelov <aleksey_gorelov@phoenix.com>
		Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
		Alex Shi <alex.shi@linux.alibaba.com> <alex.shi@intel.com>
		Alex Shi <alex.shi@linux.alibaba.com> <alex.shi@linaro.org>
		Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
		Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
		Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
		Al Viro <viro@ftp.linux.org.uk>
		Al Viro <viro@zenIV.linux.org.uk>
		Andi Shyti <andi@etezian.org> <andi.shyti@samsung.com>
		@@ -46,6 +51,12 @@ Christoph Hellwig <hch@lst.de>
		Christophe Ricard <christophe.ricard@gmail.com>
		Corey Minyard <minyard@acm.org>
		Damian Hobson-Garcia <dhobsong@igel.co.jp>
		Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com>
		Daniel Borkmann <daniel@iogearbox.net> <dborkmann@redhat.com>
		Daniel Borkmann <daniel@iogearbox.net> <danborkmann@iogearbox.net>
		Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch>
		Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>
		Daniel Borkmann <daniel@iogearbox.net> <dxchgb@gmail.com>
		David Brownell <david-b@pacbell.net>
		David Woodhouse <dwmw2@shinybook.infradead.org>
		Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>
		@@ -117,6 +128,8 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com>
		Linas Vepstas <linas@austin.ibm.com>
		Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
		Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
		Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
		Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>
		Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>
		Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
		Mark Brown <broonie@sirena.org.uk>
		@@ -156,6 +169,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>
		@@ -187,6 +202,7 @@ Santosh Shilimkar <ssantosh@kernel.org>
		Santosh Shilimkar <santosh.shilimkar@oracle.org>
		Sascha Hauer <s.hauer@pengutronix.de>
		S.Çağlar Onur <caglar@pardus.org.tr>
		Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>
		Sebastian Reichel <sre@kernel.org> <sre@debian.org>
		Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>
		Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
		@@ -205,6 +221,8 @@ Tejun Heo <htejun@gmail.com>
		Thomas Graf <tgraf@suug.ch>
		Thomas Pedersen <twp@codeaurora.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>
		Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
		Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
		Uwe Kleine-König <ukl@pengutronix.de>
		@@ -224,3 +242,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>

Documentation/ABI/testing/sysfs-class-net-batman-adv→Documentation/ABI/obsolete/sysfs-class-net-batman-adv

+2 −0

Original line number	Diff line number	Diff line
		This ABI is deprecated and will be removed after 2021. It is
		replaced with the batadv generic netlink family.

		What: /sys/class/net/<iface>/batman-adv/elp_interval
		Date: Feb 2014