Commit 876f7a43 authored by Joonas Lahtinen's avatar Joonas Lahtinen
Browse files

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



Backmerge to bring in 5.17-rc2 to introduce a common baseline
to merge i915_regs changes from drm-intel-next.

Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
parents 86df4141 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

+4 −0
Original line number Diff line number Diff line
@@ -44,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>
@@ -67,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>

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.