# git rev-parse -q --verify 9e1fd794cb6bf813a40849a1fc236703bdcbc1a7^{commit} 9e1fd794cb6bf813a40849a1fc236703bdcbc1a7 already have revision, skipping fetch # git checkout -q -f -B kisskb 9e1fd794cb6bf813a40849a1fc236703bdcbc1a7 # git clean -qxdf # < git log -1 # commit 9e1fd794cb6bf813a40849a1fc236703bdcbc1a7 # Merge: b1e243957e9b 1b9598c8fb99 # Author: Linus Torvalds # Date: Thu Mar 7 09:38:51 2019 -0800 # # Merge tag 'xfs-5.1-merge-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux # # Pull xfs updates from Darrick Wong: # "Here are a number of new features and bug fixes for 5.1 # # They've undergone a week's worth of fstesting and merge cleanly with # master as of this morning # # Most of the changes center on improving metadata validation and fixing # problems with online fsck, though there's also a new cache to speed up # unlinked inode handling and cleanup of the copy on write code in # preparation for future features # # Changes for Linux 5.1: # # - Fix online fsck to handle inode btrees correctly on 64k block # filesystems # # - Teach online fsck to check directory and attribute names for # invalid characters # # - Miscellanous fixes for online fsck # # - Introduce a new panic mask so that we can halt immediately on # metadata corruption (for debugging purposes) # # - Fix a block mapping race during writeback # # - Cache unlinked inode list backrefs in memory to speed up list # processing # # - Separate the bnobt/cntbt and inobt/finobt buffer verifiers so that # we can detect crosslinked btrees # # - Refactor magic number verification so that we can standardize it # # - Strengthen ondisk metadata structure offset build time verification # # - Fix a memory corruption problem in the listxattr code # # - Fix a shutdown problem during log recovery due to unreserved finobt # expansion # # - Fix a referential integrity problem where O_TMPFILE inodes were put # on the unlinked list with nlink > 0 which would cause asserts # during log recovery if the system went down immediately # # - Refactor the delayed allocation allocator to be more clever about # the possibility that its mapping might be stale # # - Various fixes to the copy on write mechanism # # - Make CoW preallocation suitable for use even with writes that # wouldn't otherwise require it # # - Refactor an internal API # # - Fix some statx implementation bugs # # - Fix miscellaneous compiler and static checker complaints" # # * tag 'xfs-5.1-merge-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: (70 commits) # xfs: fix reporting supported extra file attributes for statx() # xfs: fix backwards endian conversion in scrub # xfs: fix uninitialized error variables # xfs: rework breaking of shared extents in xfs_file_iomap_begin # xfs: don't pass iomap flags to xfs_reflink_allocate_cow # xfs: fix uninitialized error variable # xfs: introduce an always_cow mode # xfs: report IOMAP_F_SHARED from xfs_file_iomap_begin_delay # xfs: make COW fork unwritten extent conversions more robust # xfs: merge COW handling into xfs_file_iomap_begin_delay # xfs: also truncate holes covered by COW blocks # xfs: don't use delalloc extents for COW on files with extsize hints # xfs: fix SEEK_DATA for speculative COW fork preallocation # xfs: make xfs_bmbt_to_iomap more useful # xfs: fix xfs_buf magic number endian checks # xfs: retry COW fork delalloc conversion when no extent was found # xfs: remove the truncate short cut in xfs_map_blocks # xfs: move xfs_iomap_write_allocate to xfs_aops.c # xfs: move stat accounting to xfs_bmapi_convert_delalloc # xfs: move transaction handling to xfs_bmapi_convert_delalloc # .. # < /opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-gcc --version # < /opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-ld --version # < git log --format=%s --max-count=1 9e1fd794cb6bf813a40849a1fc236703bdcbc1a7 # < make -s -j 120 ARCH=mips O=/kisskb/build/linus_mips-defconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- defconfig # make -s -j 120 ARCH=mips O=/kisskb/build/linus_mips-defconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- In file included from /kisskb/src/include/linux/kernel.h:14:0, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/preempt.h:11, from /kisskb/src/include/linux/spinlock.h:51, from /kisskb/src/include/linux/fdtable.h:11, from /kisskb/src/fs/notify/fanotify/fanotify.c:3: /kisskb/src/fs/notify/fanotify/fanotify.c: In function 'fanotify_encode_fid': /kisskb/src/include/linux/kern_levels.h:5:18: warning: format '%x' expects argument of type 'unsigned int', but argument 2 has type 'long int' [-Wformat=] #define KERN_SOH "\001" /* ASCII Start Of Header */ ^ /kisskb/src/include/linux/printk.h:424:10: note: in definition of macro 'printk_ratelimited' printk(fmt, ##__VA_ARGS__); \ ^ /kisskb/src/include/linux/kern_levels.h:12:22: note: in expansion of macro 'KERN_SOH' #define KERN_WARNING KERN_SOH "4" /* warning conditions */ ^ /kisskb/src/include/linux/printk.h:440:21: note: in expansion of macro 'KERN_WARNING' printk_ratelimited(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__) ^ /kisskb/src/fs/notify/fanotify/fanotify.c:249:2: note: in expansion of macro 'pr_warn_ratelimited' pr_warn_ratelimited("fanotify: failed to encode fid (fsid=%x.%x, " ^ /kisskb/src/include/linux/kern_levels.h:5:18: warning: format '%x' expects argument of type 'unsigned int', but argument 3 has type 'long int' [-Wformat=] #define KERN_SOH "\001" /* ASCII Start Of Header */ ^ /kisskb/src/include/linux/printk.h:424:10: note: in definition of macro 'printk_ratelimited' printk(fmt, ##__VA_ARGS__); \ ^ /kisskb/src/include/linux/kern_levels.h:12:22: note: in expansion of macro 'KERN_SOH' #define KERN_WARNING KERN_SOH "4" /* warning conditions */ ^ /kisskb/src/include/linux/printk.h:440:21: note: in expansion of macro 'KERN_WARNING' printk_ratelimited(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__) ^ /kisskb/src/fs/notify/fanotify/fanotify.c:249:2: note: in expansion of macro 'pr_warn_ratelimited' pr_warn_ratelimited("fanotify: failed to encode fid (fsid=%x.%x, " ^ In file included from /kisskb/src/include/linux/kernel.h:14:0, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/wait.h:7, from /kisskb/src/include/linux/wait_bit.h:8, from /kisskb/src/include/linux/fs.h:6, from /kisskb/src/fs/notify/mark.c:76: /kisskb/src/fs/notify/mark.c: In function 'fsnotify_add_mark_list': /kisskb/src/include/linux/kern_levels.h:5:18: warning: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'long int' [-Wformat=] #define KERN_SOH "\001" /* ASCII Start Of Header */ ^ /kisskb/src/include/linux/printk.h:424:10: note: in definition of macro 'printk_ratelimited' printk(fmt, ##__VA_ARGS__); \ ^ /kisskb/src/include/linux/kern_levels.h:12:22: note: in expansion of macro 'KERN_SOH' #define KERN_WARNING KERN_SOH "4" /* warning conditions */ ^ /kisskb/src/include/linux/printk.h:440:21: note: in expansion of macro 'KERN_WARNING' printk_ratelimited(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__) ^ /kisskb/src/fs/notify/mark.c:587:3: note: in expansion of macro 'pr_warn_ratelimited' pr_warn_ratelimited("%s: fsid mismatch on object of type %u: " ^ /kisskb/src/include/linux/kern_levels.h:5:18: warning: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'long int' [-Wformat=] #define KERN_SOH "\001" /* ASCII Start Of Header */ ^ /kisskb/src/include/linux/printk.h:424:10: note: in definition of macro 'printk_ratelimited' printk(fmt, ##__VA_ARGS__); \ ^ /kisskb/src/include/linux/kern_levels.h:12:22: note: in expansion of macro 'KERN_SOH' #define KERN_WARNING KERN_SOH "4" /* warning conditions */ ^ /kisskb/src/include/linux/printk.h:440:21: note: in expansion of macro 'KERN_WARNING' printk_ratelimited(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__) ^ /kisskb/src/fs/notify/mark.c:587:3: note: in expansion of macro 'pr_warn_ratelimited' pr_warn_ratelimited("%s: fsid mismatch on object of type %u: " ^ /kisskb/src/include/linux/kern_levels.h:5:18: warning: format '%x' expects argument of type 'unsigned int', but argument 6 has type 'long int' [-Wformat=] #define KERN_SOH "\001" /* ASCII Start Of Header */ ^ /kisskb/src/include/linux/printk.h:424:10: note: in definition of macro 'printk_ratelimited' printk(fmt, ##__VA_ARGS__); \ ^ /kisskb/src/include/linux/kern_levels.h:12:22: note: in expansion of macro 'KERN_SOH' #define KERN_WARNING KERN_SOH "4" /* warning conditions */ ^ /kisskb/src/include/linux/printk.h:440:21: note: in expansion of macro 'KERN_WARNING' printk_ratelimited(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__) ^ /kisskb/src/fs/notify/mark.c:587:3: note: in expansion of macro 'pr_warn_ratelimited' pr_warn_ratelimited("%s: fsid mismatch on object of type %u: " ^ /kisskb/src/include/linux/kern_levels.h:5:18: warning: format '%x' expects argument of type 'unsigned int', but argument 7 has type 'long int' [-Wformat=] #define KERN_SOH "\001" /* ASCII Start Of Header */ ^ /kisskb/src/include/linux/printk.h:424:10: note: in definition of macro 'printk_ratelimited' printk(fmt, ##__VA_ARGS__); \ ^ /kisskb/src/include/linux/kern_levels.h:12:22: note: in expansion of macro 'KERN_SOH' #define KERN_WARNING KERN_SOH "4" /* warning conditions */ ^ /kisskb/src/include/linux/printk.h:440:21: note: in expansion of macro 'KERN_WARNING' printk_ratelimited(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__) ^ /kisskb/src/fs/notify/mark.c:587:3: note: in expansion of macro 'pr_warn_ratelimited' pr_warn_ratelimited("%s: fsid mismatch on object of type %u: " ^ FIT description: Linux 5.0.0-g9e1fd794cb6b Created: Fri Mar 8 06:30:47 2019 Image 0 (kernel@0) Description: Linux 5.0.0-g9e1fd794cb6b Created: Fri Mar 8 06:30:47 2019 Type: Kernel Image Compression: gzip compressed Data Size: 4522947 Bytes = 4416.94 KiB = 4.31 MiB Architecture: MIPS OS: Linux Load Address: 0x80100000 Entry Point: 0x8085f630 Hash algo: sha1 Hash value: 9233503f9671de9caec25cb4d24f018a9b26f90d Image 1 (fdt@boston) Description: img,boston Device Tree Created: Fri Mar 8 06:30:47 2019 Type: Flat Device Tree Compression: uncompressed Data Size: 3793 Bytes = 3.70 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 4799f50d688573234da6e9d7701234d394759ef4 Image 2 (fdt@ni169445) Description: NI 169445 device tree Created: Fri Mar 8 06:30:47 2019 Type: Flat Device Tree Compression: uncompressed Data Size: 1871 Bytes = 1.83 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 51b89b31605ee62038c8468c429af091dfc75ec7 Image 3 (fdt@xilfpga) Description: MIPSfpga (xilfpga) Device Tree Created: Fri Mar 8 06:30:47 2019 Type: Flat Device Tree Compression: uncompressed Data Size: 2708 Bytes = 2.64 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 63d058b780f65e22da30f0a183433765f1807f1d Default Configuration: 'conf@default' Configuration 0 (conf@default) Description: Generic Linux kernel Kernel: kernel@0 Configuration 1 (conf@boston) Description: Boston Linux kernel Kernel: kernel@0 FDT: fdt@boston Configuration 2 (conf@ni169445) Description: NI 169445 Linux Kernel Kernel: kernel@0 FDT: fdt@ni169445 Configuration 3 (conf@xilfpga) Description: MIPSfpga Linux kernel Kernel: kernel@0 FDT: fdt@xilfpga Completed OK # rm -rf /kisskb/build/linus_mips-defconfig_mipsel # Build took: 0:01:00.490600