Merge branch 'master' into mm-hotfixes-stable (f0b7a0d1) · Commits · git / linux-net

.editorconfig

0 → 100644

+32 −0

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0-only

		root = true

		[{.{awk,c,dts,dtsi,dtso,h,mk,s,S},Kconfig,Makefile,Makefile.}]
		charset = utf-8
		end_of_line = lf
		trim_trailing_whitespace = true
		insert_final_newline = true
		indent_style = tab
		indent_size = 8

		[*.{json,py,rs}]
		charset = utf-8
		end_of_line = lf
		trim_trailing_whitespace = true
		insert_final_newline = true
		indent_style = space
		indent_size = 4

		# this must be below the general *.py to overwrite it
		[tools/{perf,power,rcu,testing/kunit}/**.py,]
		indent_style = tab
		indent_size = 8

		[*.yaml]
		charset = utf-8
		end_of_line = lf
		trim_trailing_whitespace = unset
		insert_final_newline = true
		indent_style = space
		indent_size = 2

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -96,6 +96,7 @@ modules.order
		#
		!.clang-format
		!.cocciconfig
		!.editorconfig
		!.get_maintainer.ignore
		!.gitattributes
		!.gitignore

.mailmap

+4 −3

Original line number	Diff line number	Diff line
		@@ -390,9 +390,10 @@ Matthias Fuchs <socketcan@esd.eu> <matthias.fuchs@esd.eu>
		Matthieu Baerts <matttbe@kernel.org> <matthieu.baerts@tessares.net>
		Matthieu CASTET <castet.matthieu@free.fr>
		Matti Vaittinen <mazziesaccount@gmail.com> <matti.vaittinen@fi.rohmeurope.com>
		Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>
		Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com>
		Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>
		Matt Ranostay <matt@ranostay.sg> <matt.ranostay@konsulko.com>
		Matt Ranostay <matt@ranostay.sg> <matt@ranostay.consulting>
		Matt Ranostay <matt@ranostay.sg> Matthew Ranostay <mranostay@embeddedalley.com>
		Matt Ranostay <matt@ranostay.sg> <matt.ranostay@intel.com>
		Matt Redfearn <matt.redfearn@mips.com> <matt.redfearn@imgtec.com>
		Maulik Shah <quic_mkshah@quicinc.com> <mkshah@codeaurora.org>
		Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com>

CREDITS

+25 −0

Original line number	Diff line number	Diff line
		@@ -179,6 +179,7 @@ E: ralf@gnu.org
		P: 1024/AF7B30C1 CF 97 C2 CC 6D AE A7 FE C8 BA 9C FC 88 DE 32 C3
		D: Linux/MIPS port
		D: Linux/68k hacker
		D: AX25 maintainer
		S: Hauptstrasse 19
		S: 79837 St. Blasien
		S: Germany
		@@ -677,6 +678,10 @@ D: Media subsystem (V4L/DVB) drivers and core
		D: EDAC drivers and EDAC 3.0 core rework
		S: Brazil

		N: Landen Chao
		E: Landen.Chao@mediatek.com
		D: MT7531 Ethernet switch support

		N: Raymond Chen
		E: raymondc@microsoft.com
		D: Author of Configure script
		@@ -814,6 +819,10 @@ D: Support for Xircom PGSDB9 (firmware and host driver)
		S: Bucharest
		S: Romania

		N: John Crispin
		E: john@phrozen.org
		D: MediaTek MT7623 Gigabit ethernet support

		N: Laurence Culhane
		E: loz@holmes.demon.co.uk
		D: Wrote the initial alpha SLIP code
		@@ -1538,6 +1547,10 @@ N: Andrew Haylett
		E: ajh@primag.co.uk
		D: Selection mechanism

		N: Johan Hedberg
		E: johan.hedberg@gmail.com
		D: Bluetooth subsystem maintainer

		N: Andre Hedrick
		E: andre@linux-ide.org
		E: andre@linuxdiskcert.org
		@@ -3052,6 +3065,10 @@ S: Demonstratsii 8-382
		S: Tula 300000
		S: Russia

		N: Thomas Petazzoni
		E: thomas.petazzoni@bootlin.com
		D: Driver for the Marvell Armada 370/XP network unit.

		N: Gordon Peters
		E: GordPeters@smarttech.com
		D: Isochronous receive for IEEE 1394 driver (OHCI module).
		@@ -3950,6 +3967,10 @@ S: 21513 Conradia Ct
		S: Cupertino, CA 95014
		S: USA

		N: Manohar Vanga
		E: manohar.vanga@gmail.com
		D: VME subsystem maintainer

		N: Thibaut Varène
		E: hacks+kernel@slashdirt.org
		W: http://hacks.slashdirt.org/
		@@ -4050,6 +4071,10 @@ D: Fixes for the NE/2-driver
		D: Miscellaneous MCA-support
		D: Cleanup of the Config-files

		N: Martyn Welch
		E: martyn@welchs.me.uk
		D: VME subsystem maintainer

		N: Matt Welsh
		E: mdw@metalab.unc.edu
		W: http://www.cs.berkeley.edu/~mdw

Documentation/ABI/testing/debugfs-vfio

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		What: /sys/kernel/debug/vfio
		Date: December 2023
		KernelVersion: 6.8
		Contact: Longfang Liu <liulongfang@huawei.com>
		Description: This debugfs file directory is used for debugging
		of vfio devices, it's a common directory for all vfio devices.
		Vfio core will create a device subdirectory under this
		directory.

		What: /sys/kernel/debug/vfio/<device>/migration
		Date: December 2023
		KernelVersion: 6.8
		Contact: Longfang Liu <liulongfang@huawei.com>
		Description: This debugfs file directory is used for debugging
		of vfio devices that support live migration.
		The debugfs of each vfio device that supports live migration
		could be created under this directory.

		What: /sys/kernel/debug/vfio/<device>/migration/state
		Date: December 2023
		KernelVersion: 6.8
		Contact: Longfang Liu <liulongfang@huawei.com>
		Description: Read the live migration status of the vfio device.
		The contents of the state file reflects the migration state
		relative to those defined in the vfio_device_mig_state enum