Subject: [merged] rtc-rtc-lpc32xx-remove-unnecessary-oom-messages.patch removed from -mm tree To: jg1.han@xxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Fri, 04 Apr 2014 12:35:00 -0700 The patch titled Subject: rtc: rtc-lpc32xx: remove unnecessary OOM messages has been removed from the -mm tree. Its filename was rtc-rtc-lpc32xx-remove-unnecessary-oom-messages.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Jingoo Han <jg1.han@xxxxxxxxxxx> Subject: rtc: rtc-lpc32xx: remove unnecessary OOM messages The site-specific OOM messages are unnecessary, because they duplicate the MM subsystem generic OOM message. Signed-off-by: Jingoo Han <jg1.han@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/rtc/rtc-lpc32xx.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff -puN drivers/rtc/rtc-lpc32xx.c~rtc-rtc-lpc32xx-remove-unnecessary-oom-messages drivers/rtc/rtc-lpc32xx.c --- a/drivers/rtc/rtc-lpc32xx.c~rtc-rtc-lpc32xx-remove-unnecessary-oom-messages +++ a/drivers/rtc/rtc-lpc32xx.c @@ -211,10 +211,9 @@ static int lpc32xx_rtc_probe(struct plat } rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL); - if (unlikely(!rtc)) { - dev_err(&pdev->dev, "Can't allocate memory\n"); + if (unlikely(!rtc)) return -ENOMEM; - } + rtc->irq = rtcirq; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); _ Patches currently in -mm which might be from jg1.han@xxxxxxxxxxx are origin.patch maintainers-update-ibm-serveraid-raid-info.patch drivers-video-backlight-backlightc-remove-backlight-sysfs-uevent.patch linux-next.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