Skip to content

Commit 6e11664

Browse files
committed
Merge tag 'for-6.17/block-20250728' of git://git.kernel.dk/linux
Pull block updates from Jens Axboe: - MD pull request via Yu: - call del_gendisk synchronously (Xiao) - cleanup unused variable (John) - cleanup workqueue flags (Ryo) - fix faulty rdev can't be removed during resync (Qixing) - NVMe pull request via Christoph: - try PCIe function level reset on init failure (Keith Busch) - log TLS handshake failures at error level (Maurizio Lombardi) - pci-epf: do not complete commands twice if nvmet_req_init() fails (Rick Wertenbroek) - misc cleanups (Alok Tiwari) - Removal of the pktcdvd driver This has been more than a decade coming at this point, and some recently revealed breakages that had it causing issues even for cases where it isn't required made me re-pull the trigger on this one. It's known broken and nobody has stepped up to maintain the code - Series for ublk supporting batch commands, enabling the use of multishot where appropriate - Speed up ublk exit handling - Fix for the two-stage elevator fixing which could leak data - Convert NVMe to use the new IOVA based API - Increase default max transfer size to something more reasonable - Series fixing write operations on zoned DM devices - Add tracepoints for zoned block device operations - Prep series working towards improving blk-mq queue management in the presence of isolated CPUs - Don't allow updating of the block size of a loop device that is currently under exclusively ownership/open - Set chunk sectors from stacked device stripe size and use it for the atomic write size limit - Switch to folios in bcache read_super() - Fix for CD-ROM MRW exit flush handling - Various tweaks, fixes, and cleanups * tag 'for-6.17/block-20250728' of git://git.kernel.dk/linux: (94 commits) block: restore two stage elevator switch while running nr_hw_queue update cdrom: Call cdrom_mrw_exit from cdrom_release function sunvdc: Balance device refcount in vdc_port_mpgroup_check nvme-pci: try function level reset on init failure dm: split write BIOs on zone boundaries when zone append is not emulated block: use chunk_sectors when evaluating stacked atomic write limits dm-stripe: limit chunk_sectors to the stripe size md/raid10: set chunk_sectors limit md/raid0: set chunk_sectors limit block: sanitize chunk_sectors for atomic write limits ilog2: add max_pow_of_two_factor() nvmet: pci-epf: Do not complete commands twice if nvmet_req_init() fails nvme-tcp: log TLS handshake failures at error level docs: nvme: fix grammar in nvme-pci-endpoint-target.rst nvme: fix typo in status code constant for self-test in progress nvmet: remove redundant assignment of error code in nvmet_ns_enable() nvme: fix incorrect variable in io cqes error message nvme: fix multiple spelling and grammar issues in host drivers block: fix blk_zone_append_update_request_bio() kernel-doc md/raid10: fix set but not used variable in sync_request_write() ...
2 parents c3018a2 + 5989bfe commit 6e11664

81 files changed

Lines changed: 1986 additions & 4426 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Documentation/ABI/testing/debugfs-pktcdvd

Lines changed: 0 additions & 18 deletions
This file was deleted.

Documentation/ABI/testing/sysfs-class-pktcdvd

Lines changed: 0 additions & 97 deletions
This file was deleted.

Documentation/cdrom/cdrom-standard.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,6 @@ The drive-specific, minor-like information that is registered with
273273
__u8 media_written; /* dirty flag, DVD+RW bookkeeping */
274274
unsigned short mmc3_profile; /* current MMC3 profile */
275275
int for_data; /* unknown:TBD */
276-
int (*exit)(struct cdrom_device_info *);/* unknown:TBD */
277276
int mrw_mode_page; /* which MRW mode page is in use */
278277
};
279278

Documentation/cdrom/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ CD-ROM
88
:maxdepth: 1
99

1010
cdrom-standard
11-
packet-writing
1211

1312
.. only:: subproject and html
1413

Documentation/cdrom/packet-writing.rst

Lines changed: 0 additions & 139 deletions
This file was deleted.

Documentation/nvme/nvme-pci-endpoint-target.rst

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ NVMe PCI Endpoint Function Target
66

77
:Author: Damien Le Moal <dlemoal@kernel.org>
88

9-
The NVMe PCI endpoint function target driver implements a NVMe PCIe controller
10-
using a NVMe fabrics target controller configured with the PCI transport type.
9+
The NVMe PCI endpoint function target driver implements an NVMe PCIe controller
10+
using an NVMe fabrics target controller configured with the PCI transport type.
1111

1212
Overview
1313
========
1414

15-
The NVMe PCI endpoint function target driver allows exposing a NVMe target
15+
The NVMe PCI endpoint function target driver allows exposing an NVMe target
1616
controller over a PCIe link, thus implementing an NVMe PCIe device similar to a
1717
regular M.2 SSD. The target controller is created in the same manner as when
1818
using NVMe over fabrics: the controller represents the interface to an NVMe
1919
subsystem using a port. The port transfer type must be configured to be
2020
"pci". The subsystem can be configured to have namespaces backed by regular
2121
files or block devices, or can use NVMe passthrough to expose to the PCI host an
22-
existing physical NVMe device or a NVMe fabrics host controller (e.g. a NVMe TCP
23-
host controller).
22+
existing physical NVMe device or an NVMe fabrics host controller (e.g. a NVMe
23+
TCP host controller).
2424

2525
The NVMe PCI endpoint function target driver relies as much as possible on the
2626
NVMe target core code to parse and execute NVMe commands submitted by the PCIe
@@ -181,10 +181,10 @@ Creating an NVMe endpoint device is a two step process. First, an NVMe target
181181
subsystem and port must be defined. Second, the NVMe PCI endpoint device must
182182
be setup and bound to the subsystem and port created.
183183

184-
Creating a NVMe Subsystem and Port
185-
----------------------------------
184+
Creating an NVMe Subsystem and Port
185+
-----------------------------------
186186

187-
Details about how to configure a NVMe target subsystem and port are outside the
187+
Details about how to configure an NVMe target subsystem and port are outside the
188188
scope of this document. The following only provides a simple example of a port
189189
and subsystem with a single namespace backed by a null_blk device.
190190

@@ -234,8 +234,8 @@ Finally, create the target port and link it to the subsystem::
234234
# ln -s /sys/kernel/config/nvmet/subsystems/nvmepf.0.nqn \
235235
/sys/kernel/config/nvmet/ports/1/subsystems/nvmepf.0.nqn
236236

237-
Creating a NVMe PCI Endpoint Device
238-
-----------------------------------
237+
Creating an NVMe PCI Endpoint Device
238+
------------------------------------
239239

240240
With the NVMe target subsystem and port ready for use, the NVMe PCI endpoint
241241
device can now be created and enabled. The NVMe PCI endpoint target driver
@@ -303,7 +303,7 @@ device controller::
303303

304304
nvmet_pci_epf nvmet_pci_epf.0: Enabling controller
305305

306-
On the host side, the NVMe PCI endpoint function target device will is
306+
On the host side, the NVMe PCI endpoint function target device is
307307
discoverable as a PCI device, with the vendor ID and device ID as configured::
308308

309309
# lspci -n

Documentation/userspace-api/ioctl/ioctl-number.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@ Code Seq# Include File Comments
220220
include/linux/falloc.h,
221221
linux/fs.h,
222222
'X' all fs/ocfs2/ocfs_fs.h conflict!
223-
'X' 01 linux/pktcdvd.h conflict!
224223
'Z' 14-15 drivers/message/fusion/mptctl.h
225224
'[' 00-3F linux/usb/tmc.h USB Test and Measurement Devices
226225
<mailto:gregkh@linuxfoundation.org>

MAINTAINERS

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19706,13 +19706,6 @@ S: Supported
1970619706
F: Documentation/devicetree/bindings/input/pine64,pinephone-keyboard.yaml
1970719707
F: drivers/input/keyboard/pinephone-keyboard.c
1970819708

19709-
PKTCDVD DRIVER
19710-
M: linux-block@vger.kernel.org
19711-
S: Orphan
19712-
F: drivers/block/pktcdvd.c
19713-
F: include/linux/pktcdvd.h
19714-
F: include/uapi/linux/pktcdvd.h
19715-
1971619709
PLANTOWER PMS7003 AIR POLLUTION SENSOR DRIVER
1971719710
M: Tomasz Duszynski <tduszyns@gmail.com>
1971819711
S: Maintained

block/bio-integrity.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@ int bio_integrity_add_page(struct bio *bio, struct page *page,
128128
if (bip->bip_vcnt > 0) {
129129
struct bio_vec *bv = &bip->bip_vec[bip->bip_vcnt - 1];
130130

131+
if (!zone_device_pages_have_same_pgmap(bv->bv_page, page))
132+
return 0;
133+
131134
if (bvec_try_merge_hw_page(q, bv, page, len, offset)) {
132135
bip->bip_iter.bi_size += len;
133136
return len;

0 commit comments

Comments
 (0)