The patch titled drivers-rtc-rtc-mxcc-remove-defines-already-included-in-rtch-fix has been removed from the -mm tree. Its filename was drivers-rtc-rtc-mxcc-remove-defines-already-included-in-rtch-fix.patch This patch was dropped because it was folded into drivers-rtc-rtc-mxcc-remove-defines-already-included-in-rtch.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: drivers-rtc-rtc-mxcc-remove-defines-already-included-in-rtch-fix From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> maintain the code comments Cc: Alessandro Zummo <alessandro.zummo@xxxxxxxxxxxx> Cc: Vladimir Zapolskiy <vzapolskiy@xxxxxxxxx> Cc: Wolfram Sang <w.sang@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/rtc.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff -puN include/linux/rtc.h~drivers-rtc-rtc-mxcc-remove-defines-already-included-in-rtch-fix include/linux/rtc.h --- a/include/linux/rtc.h~drivers-rtc-rtc-mxcc-remove-defines-already-included-in-rtch-fix +++ a/include/linux/rtc.h @@ -92,10 +92,10 @@ struct rtc_pll_info { #define RTC_PLL_SET _IOW('p', 0x12, struct rtc_pll_info) /* Set PLL correction */ /* interrupt flags */ -#define RTC_IRQF 0x80 /* any of the following is active */ -#define RTC_PF 0x40 -#define RTC_AF 0x20 -#define RTC_UF 0x10 +#define RTC_IRQF 0x80 /* Any of the following is active */ +#define RTC_PF 0x40 /* Periodic interrupt */ +#define RTC_AF 0x20 /* Alarm interrupt */ +#define RTC_UF 0x10 /* Update interrupt for 1Hz RTC */ #ifdef __KERNEL__ _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch drivers-video-mb862xx-mb862xxfbdrvc-needs-uaccessh.patch drivers-bcma-host_pcic-needs-slabh.patch include-linux-hugetlbh-needs-mm_typesh.patch drivers-rtc-rtc-mrstc-use-release_mem_region-after-request_mem_region.patch drivers-rtc-rtc-mxcc-remove-defines-already-included-in-rtch.patch ufs-truncated-values-handling-64-bit-metadata-fix.patch documentation-accounting-getdelaysc-handle-sendto-failures.patch documentation-configfs-examples-crash-fix-checkpatch-fixes.patch mm-move-enum-vm_event_item-into-a-standalone-header-file.patch memcg-reclaim-memory-from-nodes-in-round-robin-fix.patch add-the-pagefault-count-into-memcg-stats.patch fs-partitions-efic-corrupted-guid-partition-tables-can-cause-kernel-oops-fix.patch kernel-profilec-remove-some-duplicate-code-from-profile_hits-fix.patch w1-add-maxim-dallas-ds2780-stand-alone-fuel-gauge-ic-support-v3-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