From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + linux-next-git-rejects.patch added to -mm tree Date: Thu, 26 May 2011 12:39:19 -0700 Message-ID: <201105261937.p4QJbXqC015226@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:36435 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757775Ab1EZThf (ORCPT ); Thu, 26 May 2011 15:37:35 -0400 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id p4QJbY66013306 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 26 May 2011 12:37:34 -0700 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 linux-next-git-rejects has been added to the -mm tree. Its filename is linux-next-git-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 *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: linux-next-git-rejects From: Andrew Morton Signed-off-by: Andrew Morton --- mm/Kconfig | 4 ---- 1 file changed, 4 deletions(-) diff -puN mm/Kconfig~linux-next-git-rejects mm/Kconfig --- a/mm/Kconfig~linux-next-git-rejects +++ a/mm/Kconfig @@ -350,11 +350,7 @@ config NEED_PER_CPU_KM config CLEANCACHE bool "Enable cleancache driver to cache clean pages if tmem is present" -<<<<<<< HEAD default n -======= - default y ->>>>>>> FETCH_HEAD help Cleancache can be thought of as a page-granularity victim cache for clean pages that the kernel's pageframe replacement algorithm _ Patches currently in -mm which might be from akpm@linux-foundation.org are origin.patch drivers-video-mb862xx-mb862xxfbdrvc-needs-uaccessh.patch drivers-bcma-host_pcic-needs-slabh.patch drivers-rtc-rtc-mrstc-use-release_mem_region-after-request_mem_region-fix.patch drivers-rtc-rtc-mxcc-remove-defines-already-included-in-rtch-fix.patch ufs-truncated-values-handling-64-bit-metadata-fix.patch backlight-add-backlight-type-fix.patch linux-next.patch linux-next-git-rejects.patch next-remove-localversion.patch i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch revert-m68k-merge-mmu-and-non-mmu-bitopsh.patch drivers-base-platformc-dont-mark-platform_device_register_resndata-as-__init_or_module.patch arch-x86-include-asm-delayh-fix-udelay-and-ndelay-for-8-bit-args.patch mtd-convert-to-seq_file-interface.patch rfcomm-corec-avoid-dangling-pointer-check-session-exists-checkpatch-fixes.patch slab-use-numa_no_node.patch mm.patch writeback-sync-expired-inodes-first-in-background-writeback-fix.patch writeback-split-inode_wb_list_lock-into-bdi_writebacklist_lock-fix-fix.patch writeback-split-inode_wb_list_lock-into-bdi_writebacklist_lock-fix-fix-fix.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch hpet-factor-timer-allocate-from-open.patch leds-route-kbd-leds-through-the-generic-leds-layer.patch checkpatch-suggest-using-min_t-or-max_t.patch lib-hexdumpc-make-hex2bin-return-the-updated-src-address.patch fs-binfmt_miscc-use-kernels-hex_to_bin-method-fix.patch fs-binfmt_miscc-use-kernels-hex_to_bin-method-fix-fix.patch rtc-driver-for-pt7c4338-chip-checkpatch-fixes.patch rtc-driver-for-pt7c4338-chip-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 cpusets-randomize-node-rotor-used-in-cpuset_mem_spread_node.patch cpusets-randomize-node-rotor-used-in-cpuset_mem_spread_node-cpusets-initialize-spread-rotor-lazily-fix.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 scatterlist-new-helper-functions.patch scatterlist-new-helper-functions-update-fix.patch w1-add-maxim-dallas-ds2780-stand-alone-fuel-gauge-ic-support-v3-fix.patch kexec-remove-kmsg_dump_kexec-fix.patch journal_add_journal_head-debug.patch mutex-subsystem-synchro-test-module-fix.patch slab-leaks3-default-y.patch put_bh-debug.patch memblock-add-input-size-checking-to-memblock_find_region.patch memblock-add-input-size-checking-to-memblock_find_region-fix.patch