The patch titled fix-kerneldoc-comments-in-kernel-timerc fix has been removed from the -mm tree. Its filename is fix-kerneldoc-comments-in-kernel-timerc-fix.patch This patch was dropped because it was folded into fix-kerneldoc-comments-in-kernel-timerc.patch ------------------------------------------------------ Subject: fix-kerneldoc-comments-in-kernel-timerc fix From: Randy Dunlap <rdunlap@xxxxxxxxxxxx> Fix function description + definition so that a #macro does not come between them and interfere with the kernel-doc. Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx> Cc: Rolf Eike Beer <eike-kernel@xxxxxxxxx> Cc: Alan Cox <alan@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- diff -puN kernel/timer.c~fix-kerneldoc-comments-in-kernel-timerc-fix kernel/timer.c --- a/kernel/timer.c~fix-kerneldoc-comments-in-kernel-timerc-fix +++ a/kernel/timer.c @@ -406,6 +406,8 @@ static int cascade(tvec_base_t *base, tv return index; } +#define INDEX(N) ((base->timer_jiffies >> (TVR_BITS + (N) * TVN_BITS)) & TVN_MASK) + /** * __run_timers - run all expired timers (if any) on this CPU. * @base: the timer vector to be processed. @@ -413,8 +415,6 @@ static int cascade(tvec_base_t *base, tv * This function cascades all vectors and executes all expired timer * vectors. */ -#define INDEX(N) ((base->timer_jiffies >> (TVR_BITS + (N) * TVN_BITS)) & TVN_MASK) - static inline void __run_timers(tvec_base_t *base) { struct timer_list *timer; _ Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxx are origin.patch kernel-params-must_check-fixes.patch blockdevc-check-errors.patch block-handle-subsystem_register-init-errors.patch fs-namespace-handle-init-registration-errors.patch kernel-doc-for-relay-interface.patch kernel-doc-move-filesystems-together.patch include-documentation-for-functions-in-drivers-base-classc.patch fix-parameter-names-in-drivers-base-classc.patch fix-kerneldoc-comments-in-kernel-timerc.patch fix-kerneldoc-comments-in-kernel-timerc-fix.patch cdev-documentation-was-drop-second-arg-of-unregister_chrdev.patch docbook-fix-segfault-in-docprocc.patch doc-fix-kernel-parameters-quiet.patch mention-documenation-abi-requirements-in-documentation-submitchecklist.patch allow-proc-configgz-to-be-built-as-a-module.patch lib-add-gen_pool_destroy.patch make-genpool-allocator-adhere-to-kernel-doc-standards.patch list-module-taint-flags-in-oops-panic.patch list-module-taint-flags-in-oops-panic-tidy.patch fix-embedded-sysctl-menu.patch fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-cachefiles-printk-format-warning.patch ecryptfs-fix-printk-format-warnings.patch ide-core-must_check-fixes.patch documentation-fixes-in-intel810txt.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