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