linux-next: build failure after merge of the block tree

Hi all,

After merging the block tree, today's linux-next build (x86_64 allmodconfig) failed like this:

/tmp/next/build/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c: In function 'iwl_dbgfs_sram_read':
/tmp/next/build/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c:135:15: error: implicit declaration of function 'simple_copy_to_iter'; did you mean '_copy_to_iter'? [-Wimplicit-function-declaration]

 135 |         ret = simple_copy_to_iter(buf, &iocb->ki_pos, pos, to);
     |               ^~~~~~~~~~~~~~~~~~~
     |               _copy_to_iter

make[9]: *** [/tmp/next/build/scripts/Makefile.build:289

Caused by commit

4f2ea80dc6c44 (fixup! treewide: fix remaining read/write iterator conversion issues)

I suspect I ought to be applying a merge fixup however since the block tree obviously isn't intended to be in the state it's in anyway I've merged the version from 20260305 for now instead. <signature.asc>

Quoted 4 lines · Mark Brown

I suspect I ought to be applying a merge fixup however since the block tree obviously isn't intended to be in the state it's in anyway I've merged the version from 20260305 for now instead. <signature.asc>

What branch are you merging? rw_iter is just a test branch. Next should only be merging my for-next branch. I’ll check later if I messed up, if the above commit is in my for-next by some accident, just drop my tree for today and I’ll take a look later when I’m on my laptop.

Quoted 6 lines · Jens Axboe

Quoted 4 lines · Mark Brown

I suspect I ought to be applying a merge fixup however since the block tree obviously isn't intended to be in the state it's in anyway I've merged the version from 20260305 for now instead. <signature.asc>

Quoted 1 line

What branch are you merging? rw_iter is just a test branch. Next should only be merging my for-next branch. I’ll check later if I messed up, if the above commit is in my for-next by some accident, just drop my tree for today and I’ll take a look later when I’m on my laptop.

It's the for-next branch, the current HEAD of which is the merge e356b1868a62cf4a650b451a7296ea4762038666. The first parent of that is the fixup commit, the second is a merge up of block-7.0. Looks like the fixup ended up on the wrong branch perhaps?

Quoted 9 lines · Mark Brown

Quoted 6 lines · Jens Axboe

Quoted 4 lines · Mark Brown

I suspect I ought to be applying a merge fixup however since the block tree obviously isn't intended to be in the state it's in anyway I've merged the version from 20260305 for now instead. <signature.asc>

Quoted 6 lines

Quoted 1 line

What branch are you merging? rw_iter is just a test branch. Next should only be merging my for-next branch. I’ll check later if I messed up, if the above commit is in my for-next by some accident, just drop my tree for today and I’ll take a look later when I’m on my laptop.

It's the for-next branch, the current HEAD of which is the merge e356b1868a62cf4a650b451a7296ea4762038666. The first parent of that is the fixup commit, the second is a merge up of block-7.0. Looks like the fixup ended up on the wrong branch perhaps?

Yeah just have! I’ll sort it out, thanks for letting me know.