From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [obsolete] linux-next-git-rejects.patch removed from -mm tree Date: Tue, 16 Oct 2012 13:00:12 -0700 Message-ID: <20121016200013.AF23E200057@hpza10.eem.corp.google.com> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from mail-wg0-f74.google.com ([74.125.82.74]:43776 "EHLO mail-wg0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755308Ab2JPUAP (ORCPT ); Tue, 16 Oct 2012 16:00:15 -0400 Received: by mail-wg0-f74.google.com with SMTP id dt11so417469wgb.1 for ; Tue, 16 Oct 2012 13:00:14 -0700 (PDT) Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: akpm@linux-foundation.org, mm-commits@vger.kernel.org The patch titled Subject: linux-next-git-rejects has been removed from the -mm tree. Its filename was linux-next-git-rejects.patch This patch was dropped because it is obsolete ------------------------------------------------------ From: Andrew Morton Subject: linux-next-git-rejects Signed-off-by: Andrew Morton --- mm/huge_memory.c | 3 --- 1 file changed, 3 deletions(-) diff -puN mm/huge_memory.c~linux-next-git-rejects mm/huge_memory.c --- a/mm/huge_memory.c~linux-next-git-rejects +++ a/mm/huge_memory.c @@ -17,11 +17,8 @@ #include #include #include -<<<<<<< HEAD #include -======= #include ->>>>>>> linux-next/akpm-base #include #include #include "internal.h" _ Patches currently in -mm which might be from akpm@linux-foundation.org are linux-next.patch i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch pidns-remove-recursion-from-free_pid_ns-v5-fix.patch cpu_hotplug-unmap-cpu2node-when-the-cpu-is-hotremoved-fix.patch arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver.patch arch-x86-tools-insn_sanityc-identify-source-of-messages.patch mm.patch swap-add-a-simple-detector-for-inappropriate-swapin-readahead-fix.patch drivers-firmware-dmi_scanc-check-dmi-version-when-get-system-uuid-fix.patch drivers-firmware-dmi_scanc-fetch-dmi-version-from-smbios-if-it-exists-checkpatch-fixes.patch hfsplus-add-support-of-manipulation-by-attributes-file-checkpatch-fixes.patch fat-exportfs-rebuild-inode-if-ilookup-fails-fix.patch journal_add_journal_head-debug.patch kernel-forkc-export-kernel_thread-to-modules.patch mutex-subsystem-synchro-test-module-fix.patch slab-leaks3-default-y.patch put_bh-debug.patch