Subject: [merged] rtc-rtc-nuc900-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:34:52 -0700 The patch titled Subject: rtc: rtc-nuc900: remove unnecessary OOM messages has been removed from the -mm tree. Its filename was rtc-rtc-nuc900-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-nuc900: 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-nuc900.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff -puN drivers/rtc/rtc-nuc900.c~rtc-rtc-nuc900-remove-unnecessary-oom-messages drivers/rtc/rtc-nuc900.c --- a/drivers/rtc/rtc-nuc900.c~rtc-rtc-nuc900-remove-unnecessary-oom-messages +++ a/drivers/rtc/rtc-nuc900.c @@ -229,10 +229,9 @@ static int __init nuc900_rtc_probe(struc nuc900_rtc = devm_kzalloc(&pdev->dev, sizeof(struct nuc900_rtc), GFP_KERNEL); - if (!nuc900_rtc) { - dev_err(&pdev->dev, "kzalloc nuc900_rtc failed\n"); + if (!nuc900_rtc) return -ENOMEM; - } + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); nuc900_rtc->rtc_reg = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(nuc900_rtc->rtc_reg)) _ 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