Hi all,

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

  drivers/block/ublk_drv.c

between commit:

  69edf98be844 ("ublk: decouple zero copy from user copy")

from Linus' tree and commit:

  2a86eec6396f ("ublk: take const ubq pointer in ublk_get_iod()")

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 f9032076bc06,02e52b066318..000000000000
--- a/drivers/block/ublk_drv.c
+++ b/drivers/block/ublk_drv.c
@@@ -201,10 -208,20 +208,15 @@@ struct ublk_params_header 
  static void ublk_stop_dev_unlocked(struct ublk_device *ub);
  static void ublk_abort_queue(struct ublk_device *ub, struct ublk_queue *ubq);
  static inline struct request *__ublk_check_and_get_req(struct ublk_device *ub,
 -		struct ublk_queue *ubq, int tag, size_t offset);
 +		const struct ublk_queue *ubq, int tag, size_t offset);
  static inline unsigned int ublk_req_build_flags(struct request *req);
- static inline struct ublksrv_io_desc *ublk_get_iod(struct ublk_queue *ubq,
- 						   int tag);
+ 
+ static inline struct ublksrv_io_desc *
+ ublk_get_iod(const struct ublk_queue *ubq, unsigned tag)
+ {
+ 	return &ubq->io_cmd_buf[tag];
+ }
+ 
 -static inline bool ublk_dev_is_user_copy(const struct ublk_device *ub)
 -{
 -	return ub->dev_info.flags & (UBLK_F_USER_COPY | UBLK_F_SUPPORT_ZERO_COPY);
 -}
 -
  static inline bool ublk_dev_is_zoned(const struct ublk_device *ub)
  {
  	return ub->dev_info.flags & UBLK_F_ZONED;

On 5/4/25 9:25 PM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the block tree got a conflict in:
> 
>   drivers/block/ublk_drv.c
> 
> between commit:
> 
>   69edf98be844 ("ublk: decouple zero copy from user copy")
> 
> from Linus' tree and commit:
> 
>   2a86eec6396f ("ublk: take const ubq pointer in ublk_get_iod()")
> 
> 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.

Thanks looks good, I've merged the 6.15 block changes into
for-6.16/block to resolve this locally. Current block for-next branch
should merge cleanly.

-- 
Jens Axboe