Commit d93618da authored by Joonas Lahtinen's avatar Joonas Lahtinen
Browse files

Merge drm/drm-next into drm-intel-gt-next 

Needed to bring in v6.1-rc1 which contains commit f683b9d6 ("i915: use the VMA iterator")
which is needed for series https://patchwork.freedesktop.org/series/110083/

 .

Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
parents 6f85403e 60ba8c5b

.get_maintainer.ignore

+2 −0
Original line number Diff line number Diff line 
Alan Cox <alan@lxorguk.ukuu.org.uk>

Alan Cox <root@hraefn.swansea.linux.org.uk>

Christoph Hellwig <hch@lst.de>

Marc Gonzalez <marc.w.gonzalez@free.fr>

.gitignore

+6 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ 
*.o

*.o.*

*.patch

*.rmeta

*.rsi

*.s

*.so

*.so.dbg
@@ -97,6 +99,7 @@ modules.order 
!.gitattributes

!.gitignore

!.mailmap

!.rustfmt.toml



#

# Generated include files
@@ -162,3 +165,6 @@ x509.genkey 


# Documentation toolchain

sphinx_*/



# Rust analyzer configuration

/rust-project.json

.mailmap

+13 −3
Original line number Diff line number Diff line
@@ -71,6 +71,9 @@ Ben M Cahill <ben.m.cahill@intel.com> 
Ben Widawsky <bwidawsk@kernel.org> <ben@bwidawsk.net>

Ben Widawsky <bwidawsk@kernel.org> <ben.widawsky@intel.com>

Ben Widawsky <bwidawsk@kernel.org> <benjamin.widawsky@intel.com>

Bjorn Andersson <andersson@kernel.org> <bjorn@kryo.se>

Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@linaro.org>

Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@sonymobile.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>
@@ -98,10 +101,10 @@ Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com> 
Christian Marangi <ansuelsmth@gmail.com>

Christophe Ricard <christophe.ricard@gmail.com>

Christoph Hellwig <hch@lst.de>

Colin Ian King <colin.king@intel.com> <colin.king@canonical.com>

Colin Ian King <colin.king@intel.com> <colin.i.king@gmail.com>

Colin Ian King <colin.i.king@gmail.com> <colin.king@canonical.com>

Corey Minyard <minyard@acm.org>

Damian Hobson-Garcia <dhobsong@igel.co.jp>

Dan Carpenter <error27@gmail.com> <dan.carpenter@oracle.com>

Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>

Daniel Borkmann <daniel@iogearbox.net> <danborkmann@iogearbox.net>

Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch>
@@ -135,6 +138,7 @@ Filipe Lautert <filipe@icewall.org> 
Finn Thain <fthain@linux-m68k.org> <fthain@telegraphics.com.au>

Franck Bui-Huu <vagabon.xyz@gmail.com>

Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>

Frank Rowand <frowand.list@gmail.com> <frank.rowand@sony.com>

Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>

Frank Rowand <frowand.list@gmail.com> <frowand@mvista.com>

Frank Zago <fzago@systemfabricworks.com>
@@ -150,6 +154,8 @@ Greg Kroah-Hartman <gregkh@suse.de> 
Greg Kroah-Hartman <greg@kroah.com>

Greg Kurz <groug@kaod.org> <gkurz@linux.vnet.ibm.com>

Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>

Guilherme G. Piccoli <kernel@gpiccoli.net> <gpiccoli@linux.vnet.ibm.com>

Guilherme G. Piccoli <kernel@gpiccoli.net> <gpiccoli@canonical.com>

Guo Ren <guoren@kernel.org> <guoren@linux.alibaba.com>

Guo Ren <guoren@kernel.org> <ren_guo@c-sky.com>

Gustavo Padovan <gustavo@las.ic.unicamp.br>
@@ -253,6 +259,7 @@ Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de> 
Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>

Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>

Lorenzo Pieralisi <lpieralisi@kernel.org> <lorenzo.pieralisi@arm.com>

Luca Ceresoli <luca.ceresoli@bootlin.com> <luca@lucaceresoli.net>

Lukasz Luba <lukasz.luba@arm.com> <l.luba@partner.samsung.com>

Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>

Maciej W. Rozycki <macro@orcam.me.uk> <macro@linux-mips.org>
@@ -313,6 +320,7 @@ Morten Welinder <welinder@troll.com> 
Mythri P K <mythripk@ti.com>

Nadia Yvette Chambers <nyc@holomorphy.com> William Lee Irwin III <wli@holomorphy.com>

Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>

Neil Armstrong <neil.armstrong@linaro.org> <narmstrong@baylibre.com>

Nguyen Anh Quynh <aquynh@gmail.com>

Nicholas Piggin <npiggin@gmail.com> <npiggen@suse.de>

Nicholas Piggin <npiggin@gmail.com> <npiggin@kernel.dk>
@@ -330,6 +338,7 @@ Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com> 
Oleksij Rempel <linux@rempel-privat.de> <fixed-term.Oleksij.Rempel@de.bosch.com>

Oleksij Rempel <linux@rempel-privat.de> <o.rempel@pengutronix.de>

Oleksij Rempel <linux@rempel-privat.de> <ore@pengutronix.de>

Oliver Upton <oliver.upton@linux.dev> <oupton@google.com>

Pali Rohár <pali@kernel.org> <pali.rohar@gmail.com>

Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

Patrick Mochel <mochel@digitalimplant.org>
@@ -345,7 +354,8 @@ Peter Oruba <peter@oruba.de> 
Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>

Praveen BP <praveenbp@ti.com>

Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>

Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>

Qais Yousef <qyousef@layalina.io> <qais.yousef@imgtec.com>

Qais Yousef <qyousef@layalina.io> <qais.yousef@arm.com>

Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>

Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>

Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>

.rustfmt.toml

0 → 100644
+12 −0
Original line number Diff line number Diff line 
edition = "2021"

newline_style = "Unix"



# Unstable options that help catching some mistakes in formatting and that we may want to enable

# when they become stable.

#

# They are kept here since they are useful to run from time to time.

#format_code_in_doc_comments = true

#reorder_impl_items = true

#comment_width = 100

#wrap_comments = true

#normalize_comments = true

Documentation/ABI/stable/sysfs-driver-dma-idxd

+35 −0
Original line number Diff line number Diff line
@@ -227,6 +227,17 @@ Contact: dmaengine@vger.kernel.org 
Description:	Indicate the number of retires for an enqcmds submission on a sharedwq.

		A max value to set attribute is capped at 64.



What:		/sys/bus/dsa/devices/wq<m>.<n>/op_config

Date:		Sept 14, 2022

KernelVersion:	6.0.0

Contact:	dmaengine@vger.kernel.org

Description:	Shows the operation capability bits displayed in bitmap format

		presented by %*pb printk() output format specifier.

		The attribute can be configured when the WQ is disabled in

		order to configure the WQ to accept specific bits that

		correlates to the operations allowed. It's visible only

		on platforms that support the capability.



What:           /sys/bus/dsa/devices/engine<m>.<n>/group_id

Date:           Oct 25, 2019

KernelVersion:  5.6.0
@@ -255,3 +266,27 @@ Contact: dmaengine@vger.kernel.org 
Description:	Indicates the number of Read Buffers reserved for the use of

		engines in the group. See DSA spec v1.2 9.2.18 GRPCFG Read Buffers

		Reserved.



What:		/sys/bus/dsa/devices/group<m>.<n>/desc_progress_limit

Date:		Sept 14, 2022

KernelVersion:	6.0.0

Contact:	dmaengine@vger.kernel.org

Description:	Allows control of the number of work descriptors that can be

		concurrently processed by an engine in the group as a fraction

		of the Maximum Work Descriptors in Progress value specified in

		the ENGCAP register. The acceptable values are 0 (default),

		1 (1/2 of max value), 2 (1/4 of the max value), and 3 (1/8 of

		the max value). It's visible only on platforms that support

		the capability.



What:		/sys/bus/dsa/devices/group<m>.<n>/batch_progress_limit

Date:		Sept 14, 2022

KernelVersion:	6.0.0

Contact:	dmaengine@vger.kernel.org

Description:	Allows control of the number of batch descriptors that can be

		concurrently processed by an engine in the group as a fraction

		of the Maximum Batch Descriptors in Progress value specified in

		the ENGCAP register. The acceptable values are 0 (default),

		1 (1/2 of max value), 2 (1/4 of the max value), and 3 (1/8 of

		the max value). It's visible only on platforms that support

		the capability.