Merge branch 'x86/paravirt' into x86/entry (a3251c1a) · Commits · EulixOS / Software / Kernel

.clang-format

+7 −4

Original line number	Diff line number	Diff line
		@@ -122,6 +122,7 @@ ForEachMacros:
		- 'drm_for_each_bridge_in_chain'
		- 'drm_for_each_connector_iter'
		- 'drm_for_each_crtc'
		- 'drm_for_each_crtc_reverse'
		- 'drm_for_each_encoder'
		- 'drm_for_each_encoder_mask'
		- 'drm_for_each_fb'
		@@ -203,14 +204,13 @@ ForEachMacros:
		- 'for_each_matching_node'
		- 'for_each_matching_node_and_match'
		- 'for_each_member'
		- 'for_each_mem_region'
		- 'for_each_memblock_type'
		- 'for_each_memcg_cache_index'
		- 'for_each_mem_pfn_range'
		- '__for_each_mem_range'
		- 'for_each_mem_range'
		- '__for_each_mem_range_rev'
		- 'for_each_mem_range_rev'
		- 'for_each_mem_region'
		- 'for_each_migratetype_order'
		- 'for_each_msi_entry'
		- 'for_each_msi_entry_safe'
		@@ -276,10 +276,8 @@ ForEachMacros:
		- 'for_each_reserved_mem_range'
		- 'for_each_reserved_mem_region'
		- 'for_each_rtd_codec_dais'
		- 'for_each_rtd_codec_dais_rollback'
		- 'for_each_rtd_components'
		- 'for_each_rtd_cpu_dais'
		- 'for_each_rtd_cpu_dais_rollback'
		- 'for_each_rtd_dais'
		- 'for_each_set_bit'
		- 'for_each_set_bit_from'
		@@ -298,6 +296,7 @@ ForEachMacros:
		- '__for_each_thread'
		- 'for_each_thread'
		- 'for_each_unicast_dest_pgid'
		- 'for_each_vsi'
		- 'for_each_wakeup_source'
		- 'for_each_zone'
		- 'for_each_zone_zonelist'
		@@ -330,6 +329,7 @@ ForEachMacros:
		- 'hlist_for_each_entry_rcu_bh'
		- 'hlist_for_each_entry_rcu_notrace'
		- 'hlist_for_each_entry_safe'
		- 'hlist_for_each_entry_srcu'
		- '__hlist_for_each_rcu'
		- 'hlist_for_each_safe'
		- 'hlist_nulls_for_each_entry'
		@@ -378,6 +378,7 @@ ForEachMacros:
		- 'list_for_each_entry_safe_continue'
		- 'list_for_each_entry_safe_from'
		- 'list_for_each_entry_safe_reverse'
		- 'list_for_each_entry_srcu'
		- 'list_for_each_prev'
		- 'list_for_each_prev_safe'
		- 'list_for_each_safe'
		@@ -411,6 +412,8 @@ ForEachMacros:
		- 'of_property_for_each_string'
		- 'of_property_for_each_u32'
		- 'pci_bus_for_each_resource'
		- 'pcl_for_each_chunk'
		- 'pcl_for_each_segment'
		- 'pcm_for_each_format'
		- 'ping_portaddr_for_each_entry'
		- 'plist_for_each'

.mailmap

+9 −3

Original line number	Diff line number	Diff line
		@@ -9,9 +9,6 @@
		#
		# Please keep this list dictionary sorted.
		#
		# This comment is parsed by git-shortlog:
		# repo-abbrev: /pub/scm/linux/kernel/git/
		#
		Aaron Durbin <adurbin@google.com>
		Adam Oldham <oldhamca@gmail.com>
		Adam Radford <aradford@gmail.com>
		@@ -55,6 +52,8 @@ Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>
		Ben Gardner <bgardner@wabtec.com>
		Ben M Cahill <ben.m.cahill@intel.com>
		Björn Steinbrink <B.Steinbrink@gmx.de>
		Björn Töpel <bjorn@kernel.org> <bjorn.topel@gmail.com>
		Björn Töpel <bjorn@kernel.org> <bjorn.topel@intel.com>
		Boris Brezillon <bbrezillon@kernel.org> <b.brezillon.dev@gmail.com>
		Boris Brezillon <bbrezillon@kernel.org> <b.brezillon@overkiz.com>
		Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com>
		@@ -180,6 +179,8 @@ Kees Cook <keescook@chromium.org> <kees.cook@canonical.com>
		Kees Cook <keescook@chromium.org> <keescook@google.com>
		Kees Cook <keescook@chromium.org> <kees@outflux.net>
		Kees Cook <keescook@chromium.org> <kees@ubuntu.com>
		Keith Busch <kbusch@kernel.org> <keith.busch@intel.com>
		Keith Busch <kbusch@kernel.org> <keith.busch@linux.intel.com>
		Kenneth W Chen <kenneth.w.chen@intel.com>
		Konstantin Khlebnikov <koct9i@gmail.com> <khlebnikov@yandex-team.ru>
		Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
		@@ -200,6 +201,8 @@ Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>
		Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
		Lukasz Luba <lukasz.luba@arm.com> <l.luba@partner.samsung.com>
		Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>
		Manivannan Sadhasivam <mani@kernel.org> <manivannanece23@gmail.com>
		Manivannan Sadhasivam <mani@kernel.org> <manivannan.sadhasivam@linaro.org>
		Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
		Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>
		Mark Brown <broonie@sirena.org.uk>
		@@ -245,6 +248,7 @@ Morten Welinder <welinder@anemone.rentec.com>
		Morten Welinder <welinder@darter.rentec.com>
		Morten Welinder <welinder@troll.com>
		Mythri P K <mythripk@ti.com>
		Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.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>
		@@ -335,6 +339,8 @@ Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>
		Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>
		Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>
		Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>
		Viresh Kumar <viresh.kumar@linaro.org> <viresh.kumar@linaro.org>
		Viresh Kumar <viresh.kumar@linaro.org> <viresh.kumar@linaro.com>
		Vivien Didelot <vivien.didelot@gmail.com> <vivien.didelot@savoirfairelinux.com>
		Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com>
		Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>

CREDITS

+24 −0

Original line number	Diff line number	Diff line
		@@ -710,6 +710,10 @@ S: Las Cuevas 2385 - Bo Guemes
		S: Las Heras, Mendoza CP 5539
		S: Argentina

		N: Jay Cliburn
		E: jcliburn@gmail.com
		D: ATLX Ethernet drivers

		N: Steven P. Cole
		E: scole@lanl.gov
		E: elenstev@mesatop.com
		@@ -1284,6 +1288,10 @@ D: Major kbuild rework during the 2.5 cycle
		D: ISDN Maintainer
		S: USA

		N: Gerrit Renker
		E: gerrit@erg.abdn.ac.uk
		D: DCCP protocol support.

		N: Philip Gladstone
		E: philip@gladstonefamily.net
		D: Kernel / timekeeping stuff
		@@ -2138,6 +2146,10 @@ E: seasons@falcon.sch.bme.hu
		E: seasons@makosteszta.sote.hu
		D: Original author of software suspend

		N: Alexey Kuznetsov
		E: kuznet@ms2.inr.ac.ru
		D: Author and maintainer of large parts of the networking stack

		N: Jaroslav Kysela
		E: perex@perex.cz
		W: https://www.perex.cz
		@@ -2696,6 +2708,10 @@ N: Wolfgang Muees
		E: wolfgang@iksw-muees.de
		D: Auerswald USB driver

		N: Shrijeet Mukherjee
		E: shrijeet@gmail.com
		D: Network routing domains (VRF).

		N: Paul Mundt
		E: paul.mundt@gmail.com
		D: SuperH maintainer
		@@ -4110,6 +4126,10 @@ S: B-1206 Jingmao Guojigongyu
		S: 16 Baliqiao Nanjie, Beijing 101100
		S: People's Repulic of China

		N: Aviad Yehezkel
		E: aviadye@nvidia.com
		D: Kernel TLS implementation and offload support.

		N: Victor Yodaiken
		E: yodaiken@fsmlabs.com
		D: RTLinux (RealTime Linux)
		@@ -4167,6 +4187,10 @@ S: 1507 145th Place SE #B5
		S: Bellevue, Washington 98007
		S: USA

		N: Wensong Zhang
		E: wensong@linux-vs.org
		D: IP virtual server (IPVS).

		N: Haojian Zhuang
		E: haojian.zhuang@gmail.com
		D: MMP support

Documentation/ABI/testing/sysfs-class-devlink

+2 −2

Original line number	Diff line number	Diff line
		@@ -5,8 +5,8 @@ Description:
		Provide a place in sysfs for the device link objects in the
		kernel at any given time. The name of a device link directory,
		denoted as ... above, is of the form <supplier>--<consumer>
		where <supplier> is the supplier device name and <consumer> is
		the consumer device name.
		where <supplier> is the supplier bus:device name and <consumer>
		is the consumer bus:device name.

		What: /sys/class/devlink/.../auto_remove_on
		Date: May 2020

Documentation/ABI/testing/sysfs-devices-consumer

+3 −2

Original line number	Diff line number	Diff line
		@@ -4,5 +4,6 @@ Contact: Saravana Kannan <saravanak@google.com>
		Description:
		The /sys/devices/.../consumer:<consumer> are symlinks to device
		links where this device is the supplier. <consumer> denotes the
		name of the consumer in that device link. There can be zero or
		more of these symlinks for a given device.
		name of the consumer in that device link and is of the form
		bus:device name. There can be zero or more of these symlinks
		for a given device.