linux-kernel - linux-next: manual merge of the block tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240513122334.135fef82@canb.auug.org.au>
Date: Mon, 13 May 2024 12:23:34 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jens Axboe <axboe@...nel.dk>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, Uday Shankar
 <ushankar@...estorage.com>
Subject: linux-next: manual merge of the block tree with Linus' tree

Hi all,

Today's linux-next merge of the block tree got a conflict in:

  drivers/block/ublk_drv.c

between commit:

  eaf4a9b19b99 ("ublk: remove segment count and size limits")

from Linus' tree and commit:

  073341c3031b ("ublk_drv: set DMA alignment mask to 3")

from the block tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/block/ublk_drv.c
index 374e4efa8759,292fa2bdd77d..000000000000
--- a/drivers/block/ublk_drv.c
+++ b/drivers/block/ublk_drv.c
@@@ -2177,8 -2176,8 +2176,9 @@@ static int ublk_ctrl_start_dev(struct u
  		.max_hw_sectors		= p->max_sectors,
  		.chunk_sectors		= p->chunk_sectors,
  		.virt_boundary_mask	= p->virt_boundary_mask,
 +		.max_segments		= USHRT_MAX,
 +		.max_segment_size	= UINT_MAX,
+ 		.dma_alignment		= 3,
 -
  	};
  	struct gendisk *disk;
  	int ret = -EINVAL;

Content of type "application/pgp-signature" skipped