Commit 542898c5 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

Merge remote-tracking branch 'drm/drm-next' into drm-misc-next 



First backmerge into drm-misc-next. Required for more helpers backmerged,
and to pull in 5.17 (rc2).

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
parents ccbeca4c 53dbee49

.clang-format

+0 −1
Original line number Diff line number Diff line
@@ -216,7 +216,6 @@ ForEachMacros: 
  - 'for_each_migratetype_order'

  - 'for_each_msi_entry'

  - 'for_each_msi_entry_safe'

  - 'for_each_msi_vector'

  - 'for_each_net'

  - 'for_each_net_continue_reverse'

  - 'for_each_netdev'

.mailmap

+12 −0
Original line number Diff line number Diff line
@@ -10,10 +10,12 @@ 
# Please keep this list dictionary sorted.

#

Aaron Durbin <adurbin@google.com>

Abhinav Kumar <quic_abhinavk@quicinc.com> <abhinavk@codeaurora.org>

Adam Oldham <oldhamca@gmail.com>

Adam Radford <aradford@gmail.com>

Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>

Adrian Bunk <bunk@stusta.de>

Akhil P Oommen <quic_akhilpo@quicinc.com> <akhilpo@codeaurora.org>

Alan Cox <alan@lxorguk.ukuu.org.uk>

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

Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
@@ -42,14 +44,17 @@ Andrew Vasquez <andrew.vasquez@qlogic.com> 
Andrey Konovalov <andreyknvl@gmail.com> <andreyknvl@google.com>

Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>

Andrey Ryabinin <ryabinin.a.a@gmail.com> <aryabinin@virtuozzo.com>

Andrzej Hajda <andrzej.hajda@intel.com> <a.hajda@samsung.com>

Andy Adamson <andros@citi.umich.edu>

Antoine Tenart <atenart@kernel.org> <antoine.tenart@bootlin.com>

Antoine Tenart <atenart@kernel.org> <antoine.tenart@free-electrons.com>

Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>

Anup Patel <anup@brainfault.org> <anup.patel@wdc.com>

Archit Taneja <archit@ti.com>

Ard Biesheuvel <ardb@kernel.org> <ard.biesheuvel@linaro.org>

Arnaud Patard <arnaud.patard@rtp-net.org>

Arnd Bergmann <arnd@arndb.de>

Atish Patra <atishp@atishpatra.org> <atish.patra@wdc.com>

Axel Dyks <xl@xlsigned.net>

Axel Lin <axel.lin@gmail.com>

Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>
@@ -65,6 +70,7 @@ Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com> 
Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com>

Brian Avery <b.avery@hp.com>

Brian King <brking@us.ibm.com>

Brian Silverman <bsilver16384@gmail.com> <brian.silverman@bluerivertech.com>

Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>

Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>

Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>
@@ -172,6 +178,7 @@ Jeff Layton <jlayton@kernel.org> <jlayton@redhat.com> 
Jens Axboe <axboe@suse.de>

Jens Osterkamp <Jens.Osterkamp@de.ibm.com>

Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>

Jessica Zhang <quic_jesszhan@quicinc.com> <jesszhan@codeaurora.org>

Jiri Slaby <jirislaby@kernel.org> <jirislaby@gmail.com>

Jiri Slaby <jirislaby@kernel.org> <jslaby@novell.com>

Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.com>
@@ -191,6 +198,7 @@ Juha Yrjola <at solidboot.com> 
Juha Yrjola <juha.yrjola@nokia.com>

Juha Yrjola <juha.yrjola@solidboot.com>

Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>

Kalyan Thota <quic_kalyant@quicinc.com> <kalyan_t@codeaurora.org>

Kay Sievers <kay.sievers@vrfy.org>

Kees Cook <keescook@chromium.org> <kees.cook@canonical.com>

Kees Cook <keescook@chromium.org> <keescook@google.com>
@@ -202,9 +210,11 @@ 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>

Koushik <raghavendra.koushik@neterion.com>

Krishna Manikandan <quic_mkrishn@quicinc.com> <mkrishn@codeaurora.org>

Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>

Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>

Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Kuogee Hsieh <quic_khsieh@quicinc.com> <khsieh@codeaurora.org>

Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>

Leonid I Ananiev <leonid.i.ananiev@intel.com>

Leon Romanovsky <leon@kernel.org> <leon@leon.nu>
@@ -311,6 +321,7 @@ Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.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>

Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>

Rajesh Shah <rajesh.shah@intel.com>

Ralf Baechle <ralf@linux-mips.org>

Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
@@ -325,6 +336,7 @@ Rui Saraiva <rmps@joel.ist.utl.pt> 
Sachin P Sant <ssant@in.ibm.com>

Sakari Ailus <sakari.ailus@linux.intel.com> <sakari.ailus@iki.fi>

Sam Ravnborg <sam@mars.ravnborg.org>

Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org>

Santosh Shilimkar <santosh.shilimkar@oracle.org>

Santosh Shilimkar <ssantosh@kernel.org>

Sarangdhar Joshi <spjoshi@codeaurora.org>

CREDITS

+5 −0
Original line number Diff line number Diff line
@@ -315,6 +315,11 @@ S: Via Delle Palme, 9 
S: Terni 05100

S: Italy



N: Ohad Ben Cohen

E: ohad@wizery.com

D: Remote Processor (remoteproc) subsystem

D: Remote Processor Messaging (rpmsg) subsystem



N: Krzysztof Benedyczak

E: golbi@mat.uni.torun.pl

W: http://www.mat.uni.torun.pl/~golbi

Documentation/ABI/obsolete/sysfs-class-dax

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
What:           /sys/class/dax/

Date:           May, 2016

KernelVersion:  v4.7

Contact:        nvdimm@lists.linux.dev

Description:	Device DAX is the device-centric analogue of Filesystem

		DAX (CONFIG_FS_DAX).  It allows memory ranges to be

		allocated and mapped without need of an intervening file

		system.  Device DAX is strict, precise and predictable.

		Specifically this interface:



		1. Guarantees fault granularity with respect to a given

		   page size (pte, pmd, or pud) set at configuration time.



		2. Enforces deterministic behavior by being strict about

		   what fault scenarios are supported.



		The /sys/class/dax/ interface enumerates all the

		device-dax instances in the system. The ABI is

		deprecated and will be removed after 2020. It is

		replaced with the DAX bus interface /sys/bus/dax/ where

		device-dax instances can be found under

		/sys/bus/dax/devices/

Documentation/ABI/testing/sysfs-block→Documentation/ABI/stable/sysfs-block

+676 −0

File changed and moved.

Preview size limit exceeded, changes collapsed.