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: Tue, 15 Mar 2011 13:27:11 -0700 Message-ID: <201103152029.p2FKTLoo009591@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:46981 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750843Ab1COU3m (ORCPT ); Tue, 15 Mar 2011 16:29:42 -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 p2FKTMKE032684 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 15 Mar 2011 13:29:22 -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 --- arch/x86/platform/ce4100/ce4100.c | 7 ------- 1 file changed, 7 deletions(-) diff -puN arch/x86/platform/ce4100/ce4100.c~linux-next-git-rejects arch/x86/platform/ce4100/ce4100.c --- a/arch/x86/platform/ce4100/ce4100.c~linux-next-git-rejects +++ a/arch/x86/platform/ce4100/ce4100.c @@ -15,11 +15,8 @@ #include #include -<<<<<<< HEAD #include -======= #include ->>>>>>> FETCH_HEAD #include #include #include @@ -139,10 +136,6 @@ void __init x86_ce4100_early_setup(void) x86_platform.i8042_detect = ce4100_i8042_detect; x86_init.resources.probe_roms = x86_init_noop; x86_init.mpparse.get_smp_config = x86_init_uint_noop; -<<<<<<< HEAD - x86_init.mpparse.find_smp_config = sdv_find_smp_config; - x86_init.pci.init = ce4100_pci_init; -======= x86_init.mpparse.find_smp_config = x86_init_noop; #ifdef CONFIG_X86_IO_APIC _ Patches currently in -mm which might be from akpm@linux-foundation.org are linux-next.patch linux-next-git-rejects.patch next-remove-localversion.patch revert-kbuild-reenable-section-mismatch-analysis.patch i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch drivers-usb-serial-usb_wwanc-unbork.patch mm-vmap-area-cache.patch arch-x86-include-asm-delayh-fix-udelay-and-ndelay-for-8-bit-args.patch drivers-gpu-drm-radeon-atomc-fix-warning.patch leds-convert-bd2802-driver-to-dev_pm_ops-fix.patch leds-route-kbd-leds-through-the-generic-leds-layer.patch backlight-add-backlight-type-fix.patch backlight-add-backlight-type-fix-fix.patch drivers-message-fusion-mptsasc-fix-warning.patch drbd-fix-warning.patch mm.patch mm-allow-gup-to-fail-instead-of-waiting-on-a-page-fix.patch mm-batch-free-pcp-list-if-possible-fix.patch pagewalk-only-split-huge-pages-when-necessary-checkpatch-fixes.patch mm-compaction-minimise-the-time-irqs-are-disabled-while-isolating-pages-for-migration-fix.patch ksm-add-vm_stat-and-meminfo-entry-to-reflect-pte-mapping-to-ksm-pages-fix.patch ksm-add-vm_stat-and-meminfo-entry-to-reflect-pte-mapping-to-ksm-pages-fix-fix.patch ksm-add-vm_stat-and-meminfo-entry-to-reflect-pte-mapping-to-ksm-pages-fix-fix-fix.patch mm-add-__gfp_other_node-flag-checkpatch-fixes.patch mm-use-__gfp_other_node-for-transparent-huge-pages-checkpatch-fixes.patch mm-add-vm-counters-for-transparent-hugepages-checkpatch-fixes.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch hpet-factor-timer-allocate-from-open.patch arch-alpha-include-asm-ioh-s-extern-inline-static-inline.patch drivers-misc-hmc6352c-fix-wrong-return-value-checking-for-i2c_master_recv-fix.patch kernel-cpuc-fix-many-errors-related-to-style-fix.patch calibrate-retry-with-wider-bounds-when-converge-seems-to-fail-fix.patch epoll-fix-compiler-warning-and-optimize-the-non-blocking-path.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 fs-coda-fix-compile-warning-when-config_sysctl=n-fix.patch documentation-vm-page-typesc-auto-debugfs-mount-for-hwpoison-operation-fix.patch memcg-use-native-word-page-statistics-counters-fix-event-counter-breakage-with-thp-checkpatch-fixes.patch mm-memcontrolc-suppress-uninitializer-var-warning-with-older-gccs.patch cpuset-fix-unchecked-calls-to-nodemask_alloc.patch userns-security-make-capabilities-relative-to-the-user-namespace-fix.patch userns-security-make-capabilities-relative-to-the-user-namespace-fix-fix.patch userns-user-namespaces-convert-several-capable-calls-checkpatch-fixes.patch userns-userns-check-user-namespace-for-task-file-uid-equivalence-checks-checkpatch-fixes.patch userns-rename-is_owner_or_cap-to-inode_owner_or_capable-fix.patch userns-rename-is_owner_or_cap-to-inode_owner_or_capable-fix-fix.patch scatterlist-new-helper-functions.patch crash_dump-export-is_kdump_kernel-to-modules-consolidate-elfcorehdr_addr-setup_elfcorehdr-and-saved_max_pfn-fix.patch crash_dump-export-is_kdump_kernel-to-modules-consolidate-elfcorehdr_addr-setup_elfcorehdr-and-saved_max_pfn-fix-fix.patch crash_dump-export-is_kdump_kernel-to-modules-consolidate-elfcorehdr_addr-setup_elfcorehdr-and-saved_max_pfn-fix-fix-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