Commit 2e21dee6 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-6.9/amd-sfh' into for-linus 



- assorted fixes and optimizations for amd-sfh (Basavaraj Natikar)

Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
parents 9a5b1521 90184f90

.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

+10 −4
Original line number Diff line number Diff line
@@ -289,6 +289,7 @@ Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com> 
John Crispin <john@phrozen.org> <blogic@openwrt.org>

John Fastabend <john.fastabend@gmail.com> <john.r.fastabend@intel.com>

John Keeping <john@keeping.me.uk> <john@metanate.com>

John Moon <john@jmoon.dev> <quic_johmoo@quicinc.com>

John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

John Stultz <johnstul@us.ibm.com>

<jon.toppins+linux@gmail.com> <jtoppins@cumulusnetworks.com>
@@ -344,6 +345,7 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com> 
Leon Romanovsky <leon@kernel.org> <leon@leon.nu>

Leon Romanovsky <leon@kernel.org> <leonro@mellanox.com>

Leon Romanovsky <leon@kernel.org> <leonro@nvidia.com>

Leo Yan <leo.yan@linux.dev> <leo.yan@linaro.org>

Liam Mark <quic_lmark@quicinc.com> <lmark@codeaurora.org>

Linas Vepstas <linas@austin.ibm.com>

Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
@@ -363,7 +365,6 @@ Maheshwar Ajja <quic_majja@quicinc.com> <majja@codeaurora.org> 
Malathi Gottam <quic_mgottam@quicinc.com> <mgottam@codeaurora.org>

Manikanta Pubbisetty <quic_mpubbise@quicinc.com> <mpubbise@codeaurora.org>

Manivannan Sadhasivam <mani@kernel.org> <manivannanece23@gmail.com>

Manivannan Sadhasivam <mani@kernel.org> <manivannan.sadhasivam@linaro.org>

Manoj Basapathi <quic_manojbm@quicinc.com> <manojbm@codeaurora.org>

Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>

Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>
@@ -391,9 +392,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>
@@ -504,6 +506,9 @@ Ralf Baechle <ralf@linux-mips.org> 
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Ram Chandra Jangir <quic_rjangir@quicinc.com> <rjangir@codeaurora.org>

Randy Dunlap <rdunlap@infradead.org> <rdunlap@xenotime.net>

Randy Dunlap <rdunlap@infradead.org> <randy.dunlap@oracle.com>

Randy Dunlap <rdunlap@infradead.org> <rddunlap@osdl.org>

Randy Dunlap <rdunlap@infradead.org> <randy.dunlap@intel.com>

Ravi Kumar Bokka <quic_rbokka@quicinc.com> <rbokka@codeaurora.org>

Ravi Kumar Siddojigari <quic_rsiddoji@quicinc.com> <rsiddoji@codeaurora.org>

Rémi Denis-Courmont <rdenis@simphalempin.com>
@@ -582,6 +587,7 @@ Surabhi Vishnoi <quic_svishnoi@quicinc.com> <svishnoi@codeaurora.org> 
Takashi YOSHII <takashi.yoshii.zj@renesas.com>

Tamizh Chelvam Raja <quic_tamizhr@quicinc.com> <tamizhr@codeaurora.org>

Taniya Das <quic_tdas@quicinc.com> <tdas@codeaurora.org>

Tanzir Hasan <tanzhasanwork@gmail.com> <tanzirh@google.com>

Tejun Heo <htejun@gmail.com>

Tomeu Vizoso <tomeu@tomeuvizoso.net> <tomeu.vizoso@collabora.com>

Thomas Graf <tgraf@suug.ch>

CREDITS

+38 −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
@@ -2148,6 +2161,19 @@ N: Mike Kravetz 
E: mike.kravetz@oracle.com

D: Maintenance and development of the hugetlb subsystem



N: Seth Jennings

E: sjenning@redhat.com

D: Creation and maintenance of zswap



N: Dan Streetman

E: ddstreet@ieee.org

D: Maintenance and development of zswap

D: Creation and maintenance of the zpool API



N: Vitaly Wool

E: vitaly.wool@konsulko.com

D: Maintenance and development of zswap



N: Andreas S. Krebs

E: akrebs@altavista.net

D: CYPRESS CY82C693 chipset IDE, Digital's PC-Alpha 164SX boards
@@ -3052,6 +3078,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 +3980,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 +4084,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