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: Wed, 21 Jul 2010 12:03:25 -0700 Message-ID: <201007211903.o6LJ3PSL009814@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:41210 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752774Ab0GUTD4 (ORCPT ); Wed, 21 Jul 2010 15:03:56 -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 o6LJ3PNg002711 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 21 Jul 2010 12:03:26 -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/arm/mach-s5pv210/cpu.c | 10 ---------- 1 file changed, 10 deletions(-) diff -puN arch/arm/mach-s5pv210/cpu.c~linux-next-git-rejects arch/arm/mach-s5pv210/cpu.c --- a/arch/arm/mach-s5pv210/cpu.c~linux-next-git-rejects +++ a/arch/arm/mach-s5pv210/cpu.c @@ -78,12 +78,6 @@ static void s5pv210_idle(void) void __init s5pv210_map_io(void) { -<<<<<<< HEAD:arch/arm/mach-s5pv210/cpu.c -#ifdef CONFIG_S3C_DEV_ADC - s3c_device_adc.name = "s3c64xx-adc"; -#endif -======= ->>>>>>> 0113734... ARM: SAMSUNG: Implement set_name function for ADC devices:arch/arm/mach-s5pv210/cpu.c iotable_init(s5pv210_iodesc, ARRAY_SIZE(s5pv210_iodesc)); /* initialise device information early */ @@ -91,11 +85,7 @@ void __init s5pv210_map_io(void) s5pv210_default_sdhci1(); s5pv210_default_sdhci2(); -<<<<<<< HEAD:arch/arm/mach-s5pv210/cpu.c - s3c_cfcon_setname("s5pv210-pata"); -======= s3c_adc_setname("s3c64xx-adc"); ->>>>>>> 0113734... ARM: SAMSUNG: Implement set_name function for ADC devices:arch/arm/mach-s5pv210/cpu.c /* the i2c devices are directly compatible with s3c2440 */ s3c_i2c0_setname("s3c2440-i2c"); _ Patches currently in -mm which might be from akpm@linux-foundation.org are origin.patch linux-next.patch linux-next-git-rejects.patch next-remove-localversion.patch revert-driver-core-remove-config_sysfs_deprecated.patch revert-sysfs-dont-allow-the-creation-of-symlinks-we-cant-remove.patch fs-inodec-work-around-bug.patch i-need-old-gcc.patch include-linux-fsh-complete-hexification-of-fmode_-constants.patch mm-vmap-area-cache.patch acpi-fix-bogus-preemption-logic.patch compal-laptop-added-jhl90-battery-hwmon-interface.patch acer-wmi-fix-memory-leaks-in-wmab_execute-error-path.patch x86-cpufreq-make-trace_power_frequency-cpufreq-driver-independent.patch parport-prevent-arm-boards-frmo-crashing-when-cups-is-loaded-fix.patch gcc-46-btrfs-clean-up-unused-variables-bugs.patch dib3000mc-reduce-large-stack-usage-fix.patch hpet-factor-timer-allocate-from-open.patch leds-route-kbd-leds-through-the-generic-leds-layer.patch fs-squashfs-xattrc-fix-warning.patch arch-um-drivers-remove-duplicate-structure-field-initialization.patch drivers-net-82596c-fix-warning.patch 3x59x-fix-pci-resource-management.patch altera_uart-simplify-altera_uart_console_putc-checkpatch-fixes.patch serial-mcf-dont-take-spinlocks-in-already-protected-functions.patch serial-mmio32-support-for-8250_earlyc.patch security-add-const-to-security_task_setscheduler.patch sched-make-sched_param-argument-static-variables-in-some-sched_setscheduler-caller.patch scsi-remove-private-bit-macros.patch vfs-use-kmalloc-to-allocate-fdmem-if-possible.patch mm.patch mm-track-the-root-oldest-anon_vma-fix.patch oom-improve-commentary-in-dump_tasks.patch oom-sacrifice-child-with-highest-badness-score-for-parent-protect-dereferencing-of-tasks-comm.patch oom-select-task-from-tasklist-for-mempolicy-ooms-add-has_intersects_mems_allowed-uma-variant.patch mempolicy-reduce-stack-size-of-migrate_pages-fix.patch shmem-reduce-one-time-of-locking-in-pagefault-fix.patch vmscan-tracing-add-trace-events-for-lru-page-isolation-checkpatch-fixes.patch vmscan-simplify-shrink_inactive_list-checkpatch-fixes.patch vmscan-remove-unnecessary-temporary-vars-in-do_try_to_free_pages-checkpatch-fixes.patch oom-dont-try-to-kill-oom_unkillable-child-checkpatch-fixes.patch oom-move-badness-declaration-into-oomh.patch oom-move-badness-declaration-into-oomh-fix.patch writeback-avoid-unnecessary-calculation-of-bdi-dirty-thresholds-fix.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch include-linux-compiler-gcch-use-__same_type-in-__must_be_array.patch drivers-misc-support-for-the-pressure-sensor-bmp085-from-bosch-sensortec-fix.patch drivers-misc-support-for-the-pressure-sensor-bmp085-from-bosch-sensortec-update-checkpatch-fixes.patch edd-fix-possible-memory-leak-in-edd_init-error-path-fix.patch mmc-recognize-csd-structure-fix.patch mmc-fix-all-hangs-related-to-mmc-sd-card-insert-removal-during-suspend-resume.patch mmc-fix-all-hangs-related-to-mmc-sd-card-insert-removal-during-suspend-resume-fix.patch mmc-add-jz4740-mmc-driver.patch hwmon-add-support-for-jedec-jc-424-compliant-temperature-sensors.patch fix-vc-vc_origin-on-take_over_console-checkpatch-fixes.patch rtc-fixes-and-new-functionality-for-fm3130-fix.patch rtc-add-support-for-ds3232-rtc-fix.patch gpio-sx150x-add-semtech-i2c-sx150x-gpio-expander-driver-disable.patch drivers-video-via-via-gpioc-fix-warning.patch delay-accounting-re-implement-c-for-getdelaysc-to-report-information-on-a-target-command-checkpatch-fixes.patch lib-bugc-make-warn-implementation-match-the-kernel-panicc-one-checkpatch-fixes.patch kfifo-add-example-files-to-the-kernel-sample-directory-checkpatch-fixes.patch vfs-add-super-operation-writeback_inodes-fix.patch reiser4-export-remove_from_page_cache-fix.patch reiser4-export-find_get_pages.patch reiser4.patch reiser4-writeback_inodes-implementation-fix.patch reiser4-fixups.patch reiser4-broke.patch journal_add_journal_head-debug.patch slab-leaks3-default-y.patch put_bh-debug.patch getblk-handle-2tb-devices.patch