From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + linux-next-rejects.patch added to -mm tree Date: Tue, 29 May 2012 15:38:56 -0700 Message-ID: <20120529223856.7ED1CA026A@akpm.mtv.corp.google.com> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from mail-vb0-f74.google.com ([209.85.212.74]:34589 "EHLO mail-vb0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751605Ab2E2Wi5 (ORCPT ); Tue, 29 May 2012 18:38:57 -0400 Received: by vbnl22 with SMTP id l22so461527vbn.1 for ; Tue, 29 May 2012 15:38:57 -0700 (PDT) Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org Cc: akpm@linux-foundation.org The patch titled Subject: linux-next-rejects has been added to the -mm tree. Its filename is linux-next-rejects.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton Subject: linux-next-rejects Signed-off-by: Andrew Morton --- arch/x86/kernel/e820.c | 1 + drivers/platform/x86/toshiba_acpi.c | 16 ++-------------- mm/Makefile | 1 + 3 files changed, 4 insertions(+), 14 deletions(-) diff -puN arch/x86/kernel/e820.c~linux-next-rejects arch/x86/kernel/e820.c --- a/arch/x86/kernel/e820.c~linux-next-rejects +++ a/arch/x86/kernel/e820.c @@ -138,6 +138,7 @@ static void __init e820_print_type(u32 t printk(KERN_CONT "usable"); break; case E820_RESERVED: + case E820_RESERVED_EFI: printk(KERN_CONT "reserved"); break; case E820_ACPI: diff -puN drivers/platform/x86/toshiba_acpi.c~linux-next-rejects drivers/platform/x86/toshiba_acpi.c --- a/drivers/platform/x86/toshiba_acpi.c~linux-next-rejects +++ a/drivers/platform/x86/toshiba_acpi.c @@ -1201,21 +1201,9 @@ static int __devinit toshiba_acpi_add(st mutex_init(&dev->mutex); memset(&props, 0, sizeof(props)); - props.type = BACKLIGHT_PLATFORM; - props.max_brightness = HCI_LCD_BRIGHTNESS_LEVELS - 1; - dev->backlight_dev = backlight_device_register("toshiba", - &acpi_dev->dev, - dev, - &toshiba_backlight_data, - &props); - if (IS_ERR(dev->backlight_dev)) { - ret = PTR_ERR(dev->backlight_dev); - - pr_err("Could not register toshiba backlight device\n"); - dev->backlight_dev = NULL; + ret = toshiba_acpi_setup_backlight(dev); + if (ret) goto error; - } - dev->backlight_dev->props.brightness = get_lcd(dev->backlight_dev); /* Register rfkill switch for Bluetooth */ if (hci_get_bt_present(dev, &bt_present) == HCI_SUCCESS && bt_present) { diff -puN mm/Makefile~linux-next-rejects mm/Makefile --- a/mm/Makefile~linux-next-rejects +++ a/mm/Makefile @@ -29,6 +29,7 @@ obj-$(CONFIG_HAVE_MEMBLOCK) += memblock. obj-$(CONFIG_BOUNCE) += bounce.o obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o +obj-$(CONFIG_FRONTSWAP) += frontswap.o obj-$(CONFIG_HAS_DMA) += dmapool.o obj-$(CONFIG_HUGETLBFS) += hugetlb.o obj-$(CONFIG_NUMA) += mempolicy.o _ Subject: Subject: linux-next-rejects Patches currently in -mm which might be from akpm@linux-foundation.org are origin.patch mm-mmapc-find_vma-remove-unnecessary-ifmm-check.patch mm-do_migrate_pages-calls-migrate_to_node-even-if-task-is-already-on-a-correct-node.patch mm-do_migrate_pages-rename-arguments.patch mm-memcg-count-pte-references-from-every-member-of-the-reclaimed-hierarchy.patch mm-rename-is_mlocked_vma-to-mlocked_vma_newpage.patch mm-page_allocc-remove-pageblock_default_order.patch mm-remove-sparsemem-allocation-details-from-the-bootmem-allocator.patch tmpfs-support-seek_data-and-seek_hole.patch mm-page_allocc-cleanups.patch mm-fix-slab-page-flags-corruption.patch mm-push-lru-index-into-shrink_active_list.patch mm-memcg-use-vm_swappiness-from-target-memory-cgroup.patch mm-memcg-print-statistics-from-live-counters.patch memcg-always-free-struct-memcg-through-schedule_work.patch memcg-decrement-static-keys-at-real-destroy-time.patch drivers-video-backlight-apple_blc-include-header-for-exported-symbol-prototypes.patch backlight-add-lm3533-backlight-driver.patch backlight-use-pr_warn-and-pr_debug-instead-of-printk.patch backlight-apple_bl-use-pr_debug-pr_err-instead-of-printk.patch backlight-cr_bllcd-use-pr_err-pr_info-instead-of-printk.patch backlight-generic_bl-use-pr_info-instead-of-printk.patch backlight-jornada720-use-pr_err-pr_info-instead-of-printk.patch backlight-omap1-use-pr_info-instead-of-printk.patch backlight-progear-use-pr_err-instead-of-printk.patch leds-led-module-for-da9052-53-pmic-v2.patch leds-heartbeat-stop-on-shutdown.patch drivers-leds-leds-pca955xc-fix-race-condition-while-setting-brightness-on-several-leds.patch lib-string_helpersc-make-arrays-static.patch lib-bitmapc-fix-documentation-for-scnprintf-functions.patch drivers-rtc-rtc-pcf8563c-add-rtc_vl_read-rtc_vl_clr-ioctl-feature.patch rtc-rename-config_rtc_mxc-to-config_rtc_drv_mxc.patch linux-next.patch linux-next-rejects.patch i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch drivers-block-nvmec-stop-breaking-my-i386-build.patch drivers-staging-zsmalloc-zsmalloc-mainc-unbork.patch arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver.patch thermal-add-generic-cpufreq-cooling-implementation.patch thermal-exynos5-add-exynos5-thermal-sensor-driver-support.patch thermal-exynos-register-the-tmu-sensor-with-the-kernel-thermal-layer.patch fs-symlink-restrictions-on-sticky-directories.patch fs-hardlink-creation-restrictions.patch mm.patch hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix.patch hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix-fix.patch memcg-add-hugetlb-extension-fix-fix.patch hugetlbfs-add-memcg-control-files-for-hugetlbfs-use-scnprintf-instead-of-sprintf-fix.patch memcg-move-hugetlb-resource-count-to-parent-cgroup-on-memcg-removal-fix.patch memcg-move-hugetlb-resource-count-to-parent-cgroup-on-memcg-removal-fix-fix.patch hugetlb-migrate-memcg-info-from-oldpage-to-new-page-during-migration-fix.patch memcg-fix-error-code-in-hugetlb_force_memcg_empty-v2-checkpatch-fixes.patch mm-correctly-synchronize-rss-counters-at-exit-exec.patch security-keys-keyctlc-suppress-memory-allocation-failure-warning.patch isdn-add-missing-kern_cont-fix.patch nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix.patch nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix-fix.patch nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-v2-fix.patch kernel-irq-managec-use-the-pr_foo-infrastructure-to-prefix-printks.patch vsprintf-correctly-handle-width-when-flag-used-in-%p-format-checkpatch-fixes.patch vsprintf-further-optimize-decimal-conversion-checkpatch-fixes.patch kmod-avoid-deadlock-by-recursive-kmod-call.patch proc-clean-up-proc-pid-environ-handling-checkpatch-fixes.patch kernel-cpuc-document-clear_tasks_mm_cpumask.patch kernel-cpuc-document-clear_tasks_mm_cpumask-fix.patch ipc-mqueue-improve-performance-of-send-recv-fix.patch ipc-mqueue-correct-mq_attr_ok-test-fix.patch ipc-mqueue-strengthen-checks-on-mqueue-creation-fix.patch tools-selftests-add-mq_perf_tests-checkpatch-fixes.patch ipc-mqueue-add-rbtree-node-caching-support-checkpatch-fixes.patch pidns-make-killed-children-autoreap-checkpatch-fixes.patch fs-nls-add-apple-nls-fix.patch eventfd-change-int-to-__u64-in-eventfd_signal-fix.patch syscalls-x86-add-__nr_kcmp-syscall-v8.patch syscalls-x86-add-__nr_kcmp-syscall-v8-comment-update-fix.patch c-r-prctl-simplify-pr_set_mm-on-mm-code-data-assignment-fix.patch c-r-prctl-add-ability-to-get-clear_tid_address.patch notify_change-check-that-i_mutex-is-held.patch journal_add_journal_head-debug.patch mutex-subsystem-synchro-test-module-fix.patch slab-leaks3-default-y.patch put_bh-debug.patch