Commit 305a72ef authored by Dan Williams's avatar Dan Williams
Browse files

Merge branch 'for-6.1/nvdimm' into libnvdimm-for-next 

Add v6.1 content on top of some straggling updates that missed v6.0.
parents 53fc5951 6a02124c

.clang-format

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

  - 'of_property_for_each_u32'

  - 'pci_bus_for_each_resource'

  - 'pci_doe_for_each_off'

  - 'pcl_for_each_chunk'

  - 'pcl_for_each_segment'

  - 'pcm_for_each_format'

.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>

.mailmap

+14 −3
Original line number Diff line number Diff line
@@ -60,6 +60,10 @@ 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>

Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@linaro.org>

Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@spreadtrum.com>

Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@unisoc.com>

Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang7@gmail.com>

Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>

Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>

Ben Gardner <bgardner@wabtec.com>
@@ -74,6 +78,7 @@ Boris Brezillon <bbrezillon@kernel.org> <b.brezillon.dev@gmail.com> 
Boris Brezillon <bbrezillon@kernel.org> <b.brezillon@overkiz.com>

Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com>

Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com>

Brendan Higgins <brendan.higgins@linux.dev> <brendanhiggins@google.com>

Brian Avery <b.avery@hp.com>

Brian King <brking@us.ibm.com>

Brian Silverman <bsilver16384@gmail.com> <brian.silverman@bluerivertech.com>
@@ -93,8 +98,7 @@ 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>

Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>
@@ -135,6 +139,8 @@ Frank Rowand <frowand.list@gmail.com> <frowand@mvista.com> 
Frank Zago <fzago@systemfabricworks.com>

Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com>

Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>

Gao Xiang <xiang@kernel.org> <hsiangkao@linux.alibaba.com>

Gao Xiang <xiang@kernel.org> <hsiangkao@redhat.com>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@linux.vnet.ibm.com>
@@ -143,6 +149,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>
@@ -224,7 +232,7 @@ Kees Cook <keescook@chromium.org> <kees@ubuntu.com> 
Keith Busch <kbusch@kernel.org> <keith.busch@intel.com>

Keith Busch <kbusch@kernel.org> <keith.busch@linux.intel.com>

Kenneth W Chen <kenneth.w.chen@intel.com>

Kirill Tkhai <kirill.tkhai@openvz.org> <ktkhai@virtuozzo.com>

Kirill Tkhai <tkhai@ya.ru> <ktkhai@virtuozzo.com>

Konstantin Khlebnikov <koct9i@gmail.com> <khlebnikov@yandex-team.ru>

Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>

Koushik <raghavendra.koushik@neterion.com>
@@ -246,6 +254,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>
@@ -306,6 +315,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>
@@ -371,6 +381,7 @@ Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk> 
Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>

Sebastian Reichel <sre@kernel.org> <sre@debian.org>

Sedat Dilek <sedat.dilek@gmail.com> <sedat.dilek@credativ.de>

Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>

Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>

Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>

Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>

CREDITS

+8 −0
Original line number Diff line number Diff line
@@ -627,6 +627,10 @@ S: 48287 Sawleaf 
S: Fremont, California 94539

S: USA



N: Tomas Cech

E: sleep_walker@suse.com

D: arm/palm treo support



N: Florent Chabaud

E: florent.chabaud@polytechnique.org

D: software suspend
@@ -3491,6 +3495,10 @@ D: wd33c93 SCSI driver (linux-m68k) 
S: San Jose, California

S: USA



N: Joonyoung Shim

E: y0922.shim@samsung.com

D: Samsung Exynos DRM drivers



N: Robert Siemer

E: Robert.Siemer@gmx.de

P: 2048/C99A4289 2F DC 17 2E 56 62 01 C8  3D F2 AC 09 F2 E5 DD EE

Documentation/ABI/stable/sysfs-block

+9 −0
Original line number Diff line number Diff line
@@ -260,6 +260,15 @@ Description: 
		for discards, and don't read this file.





What:		/sys/block/<disk>/queue/dma_alignment

Date:		May 2022

Contact:	linux-block@vger.kernel.org

Description:

		Reports the alignment that user space addresses must have to be

		used for raw block device access with O_DIRECT and other driver

		specific passthrough mechanisms.





What:		/sys/block/<disk>/queue/fua

Date:		May 2018

Contact:	linux-block@vger.kernel.org