# git rev-parse -q --verify 37187df45af7d28d27b5c130c23f407ca9dbefa2^{commit} 37187df45af7d28d27b5c130c23f407ca9dbefa2 already have revision, skipping fetch # git checkout -q -f -B kisskb 37187df45af7d28d27b5c130c23f407ca9dbefa2 # git clean -qxdf # < git log -1 # commit 37187df45af7d28d27b5c130c23f407ca9dbefa2 # Merge: 531d29b0b674 1a31182edd00 # Author: Linus Torvalds # Date: Wed Oct 14 12:23:00 2020 -0700 # # Merge tag 'iomap-5.10-merge-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux # # Pull iomap updates from Darrick Wong: # "There's not a lot of new stuff going on here -- a little bit of code # refactoring to make iomap workable with btrfs' fsync locking model, # cleanups in preparation for adding THP support for filesystems, and # fixing a data corruption issue for blocksize < pagesize filesystems. # # Summary: # # - Don't WARN_ON weird states that unprivileged users can create. # # - Don't invalidate page cache when direct writes want to fall back to # buffered. # # - Fix some problems when readahead ios fail. # # - Fix a problem where inline data pages weren't getting flushed # during an unshare operation. # # - Rework iomap to support arbitrarily many blocks per page in # preparation to support THP for the page cache. # # - Fix a bug in the blocksize < pagesize buffered io path where we # could fail to initialize the many-blocks-per-page uptodate bitmap # correctly when the backing page is actually up to date. This could # cause us to forget to write out dirty pages. # # - Split out the generic_write_sync at the end of the directio write # path so that btrfs can drop the inode lock before sync'ing the # file. # # - Call inode_dio_end before trying to sync the file after a O_DSYNC # direct write (instead of afterwards) to match the behavior of the # old directio code" # # * tag 'iomap-5.10-merge-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: # iomap: Call inode_dio_end() before generic_write_sync() # iomap: Allow filesystem to call iomap_dio_complete without i_rwsem # iomap: Set all uptodate bits for an Uptodate page # iomap: Change calling convention for zeroing # iomap: Convert iomap_write_end types # iomap: Convert write_count to write_bytes_pending # iomap: Convert read_count to read_bytes_pending # iomap: Support arbitrarily many blocks per page # iomap: Use bitmap ops to set uptodate bits # iomap: Use kzalloc to allocate iomap_page # fs: Introduce i_blocks_per_page # iomap: Fix misplaced page flushing # iomap: Use round_down/round_up macros in __iomap_write_begin # iomap: Mark read blocks uptodate in write_begin # iomap: Clear page error before beginning a write # iomap: Fix direct I/O write consistency check # iomap: fix WARN_ON_ONCE() from unprivileged users # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 37187df45af7d28d27b5c130c23f407ca9dbefa2 # < make -s -j 24 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- mpc85xx_defconfig # < make -s -j 24 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 24 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 24 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- In file included from /kisskb/src/include/linux/kernel.h:11:0, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/module.h:12, from /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:15: /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c: In function 'allocate_bd': /kisskb/src/include/linux/err.h:22:49: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define IS_ERR_VALUE(x) unlikely((unsigned long)(void *)(x) >= (unsigned long)-MAX_ERRNO) ^ /kisskb/src/include/linux/compiler.h:78:42: note: in definition of macro 'unlikely' # define unlikely(x) __builtin_expect(!!(x), 0) ^ /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:139:6: note: in expansion of macro 'IS_ERR_VALUE' if (IS_ERR_VALUE(fep->ring_mem_addr)) ^ cc1: fatal error: opening output file arch/powerpc/boot/dts/fsl/.mpc8540ads.dtb.dts.tmp: No such file or directory compilation terminated. make[2]: *** [scripts/Makefile.lib:326: arch/powerpc/boot/dts/fsl/mpc8540ads.dtb] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [arch/powerpc/Makefile:295: zImage] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 24 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 # Build took: 0:02:31.112007