Received-SPF: pass (google.com: domain of linux-kernel+bounces-177107-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Mon, 13 May 2024 12:23:34 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next
 Mailing List <linux-next@vger.kernel.org>, Uday Shankar
 <ushankar@purestorage.com>
Subject: linux-next: manual merge of the block tree with Linus' tree
Message-ID: <20240513122334.135fef82@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/C9fpOpUrFYB=8e+qC/lc9HA";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/C9fpOpUrFYB=8e+qC/lc9HA
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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.

--=20
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		=3D p->max_sectors,
  		.chunk_sectors		=3D p->chunk_sectors,
  		.virt_boundary_mask	=3D p->virt_boundary_mask,
 +		.max_segments		=3D USHRT_MAX,
 +		.max_segment_size	=3D UINT_MAX,
+ 		.dma_alignment		=3D 3,
 -
  	};
  	struct gendisk *disk;
  	int ret =3D -EINVAL;

--Sig_/C9fpOpUrFYB=8e+qC/lc9HA
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZBeaYACgkQAVBC80lX
0GxvRgf9HqKvhrRFJLJwLrXkfwYIC0r7mUpWeUbx0ysfd4r/gGlv+7pXCAEFT7XI
4GJGyzHIvBDIaCNvLVS6EY5a7crYtLMpgkVXeXVr8ELUonAWV10xjVvxkYeCesqt
yxS4dMfQ2lSaRbhNDE9r1tbZyMs7icLMzuUvZZ2Vg9cx090Q5hzzosfT4gI8hpYN
cJADI0LngXVCwvrEaVbLrInSKNyybSXisifiCBuYY34IIHBJc1wVjGPPpXmIkuzj
TS6HVOrbwinYkyGlDDH/o1EqlXDVZXO/+zM2ys0FXsXc/zp1KA55xniicvAEgiI5
1zBdIvvne4wiACOKLPE4BRRMZqMnjg==
=up/E
-----END PGP SIGNATURE-----

--Sig_/C9fpOpUrFYB=8e+qC/lc9HA--