linux-next: manual merge of the block tree with the origin tree

linux-next: manual merge of the block tree with the origin tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1308 bytes --]

Hi all,

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

  drivers/md/raid10.c

between commit:

  17c28c2a0687 ("Revert "md/raid10: extend r10bio devs to raid disks"")

from the origin tree and commit:

  93decc563637 ("md/raid10: initialize r10_bio->read_slot before use.")

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/md/raid10.c
index 3b598a3cb462,a84fa7526a53..000000000000
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@@ -1493,7 -1506,8 +1491,8 @@@ static void __make_request(struct mdde
  	r10_bio->mddev = mddev;
  	r10_bio->sector = bio->bi_iter.bi_sector;
  	r10_bio->state = 0;
+ 	r10_bio->read_slot = -1;
 -	memset(r10_bio->devs, 0, sizeof(r10_bio->devs[0]) * conf->geo.raid_disks);
 +	memset(r10_bio->devs, 0, sizeof(r10_bio->devs[0]) * conf->copies);
  
  	if (bio_data_dir(bio) == READ)
  		raid10_read_request(mddev, bio, r10_bio);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the block tree with the origin tree

[broonie]

Hi all,

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

  drivers/block/ublk_drv.c

between commit:

  8c68ae3b22fa6 ("ublk: read any SQE values upfront")

from the origin tree and commit:

  2d786e66c9662 ("block: ublk: switch to ioctl command encoding")

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.

diff --cc drivers/block/ublk_drv.c
index 604c1a13c76ef,f554ebf735804..0000000000000
--- a/drivers/block/ublk_drv.c
+++ b/drivers/block/ublk_drv.c
@@@ -1261,10 -1259,22 +1259,23 @@@ static void ublk_handle_need_get_data(s
  	ublk_queue_cmd(ubq, req);
  }
  
+ static inline int ublk_check_cmd_op(u32 cmd_op)
+ {
+ 	u32 ioc_type = _IOC_TYPE(cmd_op);
+ 
+ 	if (IS_ENABLED(CONFIG_BLKDEV_UBLK_LEGACY_OPCODES) && ioc_type != 'u')
+ 		return -EOPNOTSUPP;
+ 
+ 	if (ioc_type != 'u' && ioc_type != 0)
+ 		return -EOPNOTSUPP;
+ 
+ 	return 0;
+ }
+ 
 -static int ublk_ch_uring_cmd(struct io_uring_cmd *cmd, unsigned int issue_flags)
 +static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd,
 +			       unsigned int issue_flags,
 +			       struct ublksrv_io_cmd *ub_cmd)
  {
 -	struct ublksrv_io_cmd *ub_cmd = (struct ublksrv_io_cmd *)cmd->cmd;
  	struct ublk_device *ub = cmd->file->private_data;
  	struct ublk_queue *ubq;
  	struct ublk_io *io;

linux-next: manual merge of the block tree with the origin tree

[Mark Brown]

Hi all,

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

  io_uring/net.c

between commit:

  9b40ba14edcdf ("Merge tag 'for-7.2/io_uring-20260615' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux")

from the origin tree and commit:

  c59e546eda5aa ("Merge branch 'for-7.2/io_uring' into for-next")

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.

diff --combined io_uring/net.c
index 00a7df803b99b,fd51dcaae8ad8..0000000000000
--- a/io_uring/net.c
+++ b/io_uring/net.c
@@@ -1885,7 -1886,7 +1885,7 @@@ out
   * which in turn end up in mnt_want_write() which will grab the fs
   * percpu start write sem. This can trigger a lockdep warning.
   */
 -static int io_bind_file_create(struct sockaddr_storage *addr, int addr_len)
 +static int io_bind_file_create(const struct sockaddr_storage *addr, int addr_len)
  {
  	const struct sockaddr_un *sun;
  

Re: linux-next: manual merge of the block tree with the origin tree

[Jens Axboe]

On 6/16/26 8:00 AM, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the block tree got a conflict in:
> 
>   io_uring/net.c
> 
> between commit:
> 
>   9b40ba14edcdf ("Merge tag 'for-7.2/io_uring-20260615' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux")
> 
> from the origin tree and commit:
> 
>   c59e546eda5aa ("Merge branch 'for-7.2/io_uring' into for-next")
> 
> 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.

I updated my for-next a few hours ago, I think you're using an older
one. Regardless, it's fine.

-- 
Jens Axboe

Re: linux-next: manual merge of the block tree with the origin tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 612 bytes --]

On Tue, Jun 16, 2026 at 08:04:50AM -0600, Jens Axboe wrote:
> On 6/16/26 8:00 AM, Mark Brown wrote:

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

> I updated my for-next a few hours ago, I think you're using an older
> one. Regardless, it's fine.

Great, thanks.  I mostly do a big block of fetches before starting the
merge (sometimes I update more through the day) rather than fetching
immediately before each merge, and the notification mails are often
delayed a bit compared to when I actually did the merge.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]