The patch titled kernelh-add-printk_ratelimited-and-pr_level_rl-rename has been removed from the -mm tree. Its filename was kernelh-add-printk_ratelimited-and-pr_level_rl-rename.patch This patch was dropped because it was folded into kernelh-add-printk_ratelimited-and-pr_level_rl.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: kernelh-add-printk_ratelimited-and-pr_level_rl-rename From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> s/_rl/_ratelimited/g Cc: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Joe Perches <joe@xxxxxxxxxxx> Cc: Naohiro Ooiwa <nooiwa@xxxxxxxxxxxxxxxx> Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- diff -puN include/linux/kernel.h~kernelh-add-printk_ratelimited-and-pr_level_rl-rename include/linux/kernel.h --- a/include/linux/kernel.h~kernelh-add-printk_ratelimited-and-pr_level_rl-rename +++ a/include/linux/kernel.h @@ -423,27 +423,27 @@ static inline char *pack_hex_byte(char * #define printk_ratelimited printk #endif -#define pr_emerg_rl(fmt, ...) \ +#define pr_emerg_ratelimited(fmt, ...) \ printk_ratelimited(KERN_EMERG pr_fmt(fmt), ##__VA_ARGS__) -#define pr_alert_rl(fmt, ...) \ +#define pr_alert_ratelimited(fmt, ...) \ printk_ratelimited(KERN_ALERT pr_fmt(fmt), ##__VA_ARGS__) -#define pr_crit_rl(fmt, ...) \ +#define pr_crit_ratelimited(fmt, ...) \ printk_ratelimited(KERN_CRIT pr_fmt(fmt), ##__VA_ARGS__) -#define pr_err_rl(fmt, ...) \ +#define pr_err_ratelimited(fmt, ...) \ printk_ratelimited(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__) -#define pr_warning_rl(fmt, ...) \ +#define pr_warning_ratelimited(fmt, ...) \ printk_ratelimited(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__) -#define pr_notice_rl(fmt, ...) \ +#define pr_notice_ratelimited(fmt, ...) \ printk_ratelimited(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__) -#define pr_info_rl(fmt, ...) \ +#define pr_info_ratelimited(fmt, ...) \ printk_ratelimited(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__) -/* no pr_cont_rl, don't do that... */ +/* no pr_cont_ratelimited, don't do that... */ /* If you are writing a driver, please use dev_dbg instead */ #if defined(DEBUG) -#define pr_debug_rl(fmt, ...) \ +#define pr_debug_ratelimited(fmt, ...) \ printk_ratelimited(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__) #else -#define pr_debug_rl(fmt, ...) \ +#define pr_debug_ratelimited(fmt, ...) \ ({ if (0) printk_ratelimited(KERN_DEBUG pr_fmt(fmt), \ ##__VA_ARGS__); 0; }) #endif _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch mmap-dont-return-enomem-when-mapcount-is-temporarily-exceeded-in-munmap.patch dev-mem-cleanup-unxlate_dev_mem_ptr-calls.patch oom-kill-fix-numa-consraint-check-with-nodemask-v42.patch mm-mlocking-in-try_to_unmap_one.patch mm-memory_hotplug-make-offline_pages-static.patch mm-hugetlb-fix-hugepage-memory-leak-in-mincore.patch mm-hugetlb-add-hugepage-support-to-pagemap.patch procfs-allow-threads-to-rename-siblings-via-proc-pid-tasks-tid-comm.patch floppy-add-an-extra-bound-check-on-ioctl-arguments.patch rwsem-fix-rwsem_is_locked-bugs.patch kernelh-add-printk_ratelimited-and-pr_level_rl.patch kernelh-add-printk_ratelimited-and-pr_level_rl-rename.patch errh-add-helper-function-to-simplify-pointer-error-checking-fix.patch cs5535-add-a-generic-mfgpt-driver-fix.patch cs5535-add-a-generic-clock-event-mfgpt-driver-fix.patch drivers-scsi-sym53c8xx_2-sym_gluec-rename-skip_spaces-to-sym_skip_spaces.patch lib-introduce-strim-checkpatch-fixes.patch blackfin-sd-host-controller-driver-fix.patch blackfin-sd-host-controller-driver-fix-fix.patch blackfin-sd-host-controller-driver-fix-fix-fix.patch crc32-minor-optimizations-and-cleanup-checkpatch-fixes.patch hwmon-w83627ehf-updates-checkpatch-fixes.patch lis3-update-documentation-to-match-latest-changes-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