The patch titled Subject: fs/quota: kernel-doc warning fixes has been added to the -mm tree. Its filename is fs-quota-kernel-doc-warning-fixes.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/fs-quota-kernel-doc-warning-fixes.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/fs-quota-kernel-doc-warning-fixes.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 *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Fabian Frederick <fabf@xxxxxxxxx> Subject: fs/quota: kernel-doc warning fixes type and id were removed and qid added to quota_send_warning in commit 431f19744d15 ("userns: Convert quota netlink aka quota_send_warning"). Signed-off-by: Fabian Frederick <fabf@xxxxxxxxx> Cc: Jan Kara <jack@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/quota/kqid.c | 2 +- fs/quota/netlink.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff -puN fs/quota/kqid.c~fs-quota-kernel-doc-warning-fixes fs/quota/kqid.c --- a/fs/quota/kqid.c~fs-quota-kernel-doc-warning-fixes +++ a/fs/quota/kqid.c @@ -55,7 +55,7 @@ EXPORT_SYMBOL(qid_lt); /** * from_kqid - Create a qid from a kqid user-namespace pair. * @targ: The user namespace we want a qid in. - * @kuid: The kernel internal quota identifier to start with. + * @kqid: The kernel internal quota identifier to start with. * * Map @kqid into the user-namespace specified by @targ and * return the resulting qid. diff -puN fs/quota/netlink.c~fs-quota-kernel-doc-warning-fixes fs/quota/netlink.c --- a/fs/quota/netlink.c~fs-quota-kernel-doc-warning-fixes +++ a/fs/quota/netlink.c @@ -32,8 +32,7 @@ static struct genl_family quota_genl_fam /** * quota_send_warning - Send warning to userspace about exceeded quota - * @type: The quota type: USRQQUOTA, GRPQUOTA,... - * @id: The user or group id of the quota that was exceeded + * @qid: The kernel internal quota identifier. * @dev: The device on which the fs is mounted (sb->s_dev) * @warntype: The type of the warning: QUOTA_NL_... * _ Patches currently in -mm which might be from fabf@xxxxxxxxx are kernel-auditfilterc-replace-countsize-kmalloc-by-kcalloc.patch fs-cifs-remove-obsolete-__constant.patch fs-cifs-filec-replace-countsize-kzalloc-by-kcalloc.patch fs-cifs-smb2filec-replace-countsize-kzalloc-by-kcalloc.patch arch-sh-mm-asids-debugfsc-use-ptr_err_or_zero.patch fs-squashfs-file_directc-replace-countsize-kmalloc-by-kmalloc_array.patch fs-squashfs-superc-logging-clean-up.patch fs-ext4-fsyncc-generic_file_fsync-call-based-on-barrier-flag.patch fs-ocfs2-slot_mapc-replace-countsize-kzalloc-by-kcalloc.patch kernel-watchdogc-convert-printk-pr_warning-to-pr_foo.patch mm-slabc-add-__init-to-init_lock_keys.patch mm-readaheadc-remove-unused-file_ra_state-from-count_history_pages.patch mm-memory_hotplugc-add-__meminit-to-grow_zone_span-grow_pgdat_span.patch mm-page_alloc-add-__meminit-to-alloc_pages_exact_nid.patch mm-page_allocc-unexport-alloc_pages_exact_nid.patch include-linux-memblockh-add-__init-to-memblock_set_bottom_up.patch mm-internalh-use-nth_page.patch mm-hwpoison-injectc-remove-unnecessary-null-test-before-debugfs_remove_recursive.patch mm-zswapc-add-__init-to-zswap_entry_cache_destroy.patch lib-test-kstrtoxc-use-array_size-instead-of-sizeof-sizeof.patch fs-compatc-remove-unnecessary-test-on-unsigned-value.patch checkpatch-emit-fewer-kmalloc_array-kcalloc-conversion-warnings.patch fs-efs-nameic-return-is-not-a-function.patch fs-ramfs-file-nommuc-replace-countsize-kzalloc-by-kcalloc.patch kernel-test_kprobesc-use-current-logging-functions.patch fs-isofs-logging-clean-up.patch fs-isofs-logging-clean-up-fix.patch fs-coda-use-linux-uaccessh.patch fs-nilfs2-superc-remove-unnecessary-test-on-unsigned-value.patch fs-ufs-convert-printk-to-pr_foo.patch fs-ufs-use-pr_fmt.patch fs-ufs-superc-use-__func__-in-logging.patch fs-ufs-superc-use-va_format-instead-of-buffer-vsnprintf.patch fs-ufs-convert-ufsd-printk-to-pr_debug.patch fs-reiserfs-replace-not-standard-%lu-%ld.patch fs-reiserfs-use-linux-uaccessh.patch fs-reiserfs-xattrc-fix-blank-line-missing-after-declarations.patch fs-hpfs-dnodec-fix-suspect-code-indent.patch fs-proc-kcorec-use-page_align-instead-of-alignpage_size.patch proc-constify-seq_operations.patch fs-exofs-ore_raidc-replace-countsize-kzalloc-by-kcalloc.patch kernel-gcov-fsc-remove-unnecessary-null-test-before-debugfs_remove.patch fs-adfs-dir_fplusc-use-array_size-instead-of-sizeof-sizeof.patch fs-adfs-dir_fplusc-replace-countsize-kzalloc-by-kcalloc.patch fs-bfs-use-bfs-prefix-for-dump_imap.patch drivers-parport-parport_ip32c-use-ptr_err_or_zero.patch fs-pstore-ram_corec-replace-countsize-kmalloc-by-kmalloc_array.patch fs-cachefiles-daemonc-remove-unnecessary-tests-on-unsigned-values.patch fs-cachefiles-bindc-remove-unnecessary-assertions.patch fs-omfs-inodec-replace-countsize-kzalloc-by-kcalloc.patch fs-romfs-superc-convert-printk-to-pr_foo.patch fs-romfs-superc-use-pr_fmt-in-logging.patch fs-romfs-superc-add-blank-line-after-declarations.patch fs-qnx6-convert-printk-to-pr_foo.patch fs-qnx6-use-pr_fmt-and-__func__-in-logging.patch fs-qnx6-update-debugging-to-current-functions.patch scripts-coccinelle-free-add-null-test-before-freeing-functions.patch fs-dlm-debug_fsc-remove-unnecessary-null-test-before-debugfs_remove.patch linux-next.patch init-mainc-code-clean-up.patch kernel-posix-timersc-code-clean-up.patch kernel-posix-timersc-code-clean-up-checkpatch-fixes.patch kernel-kprobesc-convert-printk-to-pr_foo.patch arch-sh-kernel-timec-use-ptr_err_or_zero.patch fs-quota-kernel-doc-warning-fixes.patch kernfs-kernel-doc-warning-fix.patch ntfs-kernel-doc-warning-fixes.patch ubifs-kernel-doc-warning-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