# git rev-parse -q --verify cb690f5238d71f543f4ce874aa59237cf53a877c^{commit} cb690f5238d71f543f4ce874aa59237cf53a877c already have revision, skipping fetch # git checkout -q -f -B kisskb cb690f5238d71f543f4ce874aa59237cf53a877c # git clean -qxdf # < git log -1 # commit cb690f5238d71f543f4ce874aa59237cf53a877c # Merge: 3e28850cbd35 2878feaed543 # Author: Linus Torvalds # Date: Tue Nov 9 11:24:08 2021 -0800 # # Merge tag 'for-5.16/drivers-2021-11-09' of git://git.kernel.dk/linux-block # # Pull more block driver updates from Jens Axboe: # # - Last series adding error handling support for add_disk() in drivers. # After this one, and once the SCSI side has been merged, we can # finally annotate add_disk() as must_check. (Luis) # # - bcache fixes (Coly) # # - zram fixes (Ming) # # - ataflop locking fix (Tetsuo) # # - nbd fixes (Ye, Yu) # # - MD merge via Song # - Cleanup (Yang) # - sysfs fix (Guoqing) # # - Misc fixes (Geert, Wu, luo) # # * tag 'for-5.16/drivers-2021-11-09' of git://git.kernel.dk/linux-block: (34 commits) # bcache: Revert "bcache: use bvec_virt" # ataflop: Add missing semicolon to return statement # floppy: address add_disk() error handling on probe # ataflop: address add_disk() error handling on probe # block: update __register_blkdev() probe documentation # ataflop: remove ataflop_probe_lock mutex # mtd/ubi/block: add error handling support for add_disk() # block/sunvdc: add error handling support for add_disk() # z2ram: add error handling support for add_disk() # nvdimm/pmem: use add_disk() error handling # nvdimm/pmem: cleanup the disk if pmem_release_disk() is yet assigned # nvdimm/blk: add error handling support for add_disk() # nvdimm/blk: avoid calling del_gendisk() on early failures # nvdimm/btt: add error handling support for add_disk() # nvdimm/btt: use goto error labels on btt_blk_init() # loop: Remove duplicate assignments # drbd: Fix double free problem in drbd_create_device # nvdimm/btt: do not call del_gendisk() if not needed # bcache: fix use-after-free problem in bcache_device_free() # zram: replace fsync_bdev with sync_blockdev # ... # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 cb690f5238d71f543f4ce874aa59237cf53a877c # < make -s -j 32 ARCH=m68k O=/kisskb/build/linus_m68k-allmodconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # < make -s -j 32 ARCH=m68k O=/kisskb/build/linus_m68k-allmodconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 32 ARCH=m68k O=/kisskb/build/linus_m68k-allmodconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig # make -s -j 32 ARCH=m68k O=/kisskb/build/linus_m68k-allmodconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- :1559:2: warning: #warning syscall futex_waitv not implemented [-Wcpp] In file included from : In function 'prestera_hw_build_tests', inlined from 'prestera_hw_switch_init' at /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:788:2: /kisskb/src/include/linux/compiler_types.h:335:45: error: call to '__compiletime_assert_326' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_switch_attr_req) != 16 335 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:316:25: note: in definition of macro '__compiletime_assert' 316 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:335:9: note: in expansion of macro '_compiletime_assert' 335 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:501:9: note: in expansion of macro 'BUILD_BUG_ON' 501 | BUILD_BUG_ON(sizeof(struct prestera_msg_switch_attr_req) != 16); | ^~~~~~~~~~~~ make[6]: *** [/kisskb/src/scripts/Makefile.build:287: drivers/net/ethernet/marvell/prestera/prestera_hw.o] Error 1 make[5]: *** [/kisskb/src/scripts/Makefile.build:549: drivers/net/ethernet/marvell/prestera] Error 2 make[4]: *** [/kisskb/src/scripts/Makefile.build:549: drivers/net/ethernet/marvell] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:549: drivers/net/ethernet] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:549: drivers/net] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1850: drivers] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 32 ARCH=m68k O=/kisskb/build/linus_m68k-allmodconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_m68k-allmodconfig_m68k-gcc11 # Build took: 0:15:09.970561