The patch titled fs/xfs/xfs_iops.c: unbork has been added to the -mm tree. Its filename is fs-xfs-xfs_iopsc-unbork.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: fs/xfs/xfs_iops.c: unbork From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> fs/xfs/xfs_iops.c: In function 'xfs_init_security': fs/xfs/xfs_iops.c:116: warning: passing argument 4 of 'security_inode_init_security' from incompatible pointer type include/linux/security.h:1711: note: expected 'initxattrs' but argument is of type 'char **' fs/xfs/xfs_iops.c:116: error: too many arguments to function 'security_inode_ini Not sure what's going on here, but I can't be bothered fixing it. Cc: Alex Elder <aelder@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/xfs/xfs_iops.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN fs/xfs/xfs_iops.c~fs-xfs-xfs_iopsc-unbork fs/xfs/xfs_iops.c --- a/fs/xfs/xfs_iops.c~fs-xfs-xfs_iopsc-unbork +++ a/fs/xfs/xfs_iops.c @@ -112,6 +112,7 @@ xfs_init_security( unsigned char *name; int error; +#if 0 error = security_inode_init_security(inode, dir, qstr, (char **)&name, &value, &length); if (error) { @@ -119,7 +120,7 @@ xfs_init_security( return 0; return -error; } - +#endif error = xfs_attr_set(ip, name, value, length, ATTR_SECURE); kfree(name); _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are headers_check-is-broken.patch samples-hidraw-is-busted.patch alpha-unbreak-osf_setsysinfossi_nvpairs-checkpatch-fixes.patch linux-next.patch i-need-old-gcc.patch xfs-refrigerator-went-away.patch fs-xfs-xfs_iopsc-unbork.patch arch-alpha-kernel-systblss-remove-debug-check.patch kernel-timec-change-jiffies_to_clock_t-input-parameters-type-to-unsigned-long.patch arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver.patch leds-new-pcengines-alix-system-driver-enables-leds-via-gpio-interface-fix.patch mm.patch mm-vmscan-fix-force-scanning-small-targets-without-swap-fix.patch mm-add-comments-to-explain-mm_struct-fields-fix.patch vmscan-use-atomic-long-for-shrinker-batching-fix.patch mm-avoid-null-pointer-access-in-vm_struct-via-proc-vmallocinfo.patch thp-mremap-support-and-tlb-optimization-fix.patch thp-mremap-support-and-tlb-optimization-fix-fix.patch drivers-base-inodec-let-vmstat_text-be-optional-fix.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch hpet-factor-timer-allocate-from-open.patch leds-route-kbd-leds-through-the-generic-leds-layer.patch leds-route-kbd-leds-through-the-generic-leds-layer-fix.patch lib-crc-add-slice-by-8-algorithm-to-crc32c-fix.patch lib-hexdumpc-make-hex2bin-return-the-updated-src-address.patch fs-binfmt_miscc-use-kernels-hex_to_bin-method-fix.patch fs-binfmt_miscc-use-kernels-hex_to_bin-method-fix-fix.patch ipc-introduce-shm_rmid_forced-sysctl-testing.patch nbd-replace-some-printk-with-dev_warn-and-dev_info-checkpatch-fixes.patch pps-new-client-driver-using-gpio-fix.patch scatterlist-new-helper-functions.patch scatterlist-new-helper-functions-update-fix.patch memstick-add-support-for-legacy-memorysticks-fix.patch kexec-remove-kmsg_dump_kexec.patch journal_add_journal_head-debug.patch mutex-subsystem-synchro-test-module-fix.patch slab-leaks3-default-y.patch put_bh-debug.patch memblock-add-input-size-checking-to-memblock_find_region.patch memblock-add-input-size-checking-to-memblock_find_region-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html