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: Mon, 01 Jun 2009 12:49:16 -0700 Message-ID: <200906011949.n51JnGXx015786@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:35341 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752803AbZFATtQ (ORCPT ); Mon, 1 Jun 2009 15:49:16 -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 n51JnGiq012739 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 1 Jun 2009 12:49:18 -0700 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 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 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 --- drivers/serial/8250_gsc.c | 4 ---- 1 file changed, 4 deletions(-) diff -puN drivers/serial/8250_gsc.c~linux-next-git-rejects drivers/serial/8250_gsc.c --- a/drivers/serial/8250_gsc.c~linux-next-git-rejects +++ a/drivers/serial/8250_gsc.c @@ -41,11 +41,7 @@ static int __init serial_init_chip(struc printk(KERN_INFO "Serial: device 0x%llx not configured.\n" "Enable support for Wax, Lasi, Asp or Dino.\n", -<<<<<<< HEAD:drivers/serial/8250_gsc.c (unsigned long long)dev->hpa.start); -======= - (unsigned long)dev->hpa.start); ->>>>>>> FETCH_HEAD:drivers/serial/8250_gsc.c return -ENODEV; } _ Patches currently in -mm which might be from akpm@linux-foundation.org are origin.patch revert-fbdev-uninline-lock_fb_info.patch linux-next.patch linux-next-git-rejects.patch next-remove-localversion.patch i-need-old-gcc.patch ds_selftest-is-borked.patch arch-x86-kernel-cpu-cpufreq-acpi-cpufreqc-avoid-cross-cpu-interrupts.patch cpufreq-powernow-k8-cleanup-msg-if-bios-does-not-export-acpi-_pss-cpufreq-data-cleanup.patch devres-warn-and-return-dont-crash-on-device_del-of-uninitialized-device-cleanup.patch dvb-core-fix-potential-mutex_unlock-without-mutex_lock-in-dvb_dvr_read.patch input-drivers-input-xpadc-improve-xbox-360-wireless-support-and-add-sysfs-interface.patch input-documentation-input-xpadtxt-update-for-new-driver-functionality.patch mtd-flex-onenand-support.patch pci-quirks-unhide-overflow-device-on-i828675p-pe-chipsets-v2.patch cciss-fix-scsi-device-reset-handler-fix.patch drivers-usb-serial-sierrac-fix-printk-warning.patch raw-fix-rawctl-compat-ioctls-breakage-on-amd64-and-itanic.patch libfs-make-simple_read_from_buffer-conventional.patch scsi-dpt_i2o-is-bust-on-ia64.patch drivers-rtc-rtc-cmosc-cmos_init-dont-ignore-pnp_register_driver-return-value.patch mm-consolidate-init_mm-definition-fix.patch readahead-record-mmap-read-around-states-in-file_ra_state-checkpatch-fixes.patch mm-clean-up-get_user_pages_fast-documentation-checkpatch-fixes.patch ksm-add-get_pte-helper-function-fetching-pte-for-va-fix.patch ksm-add-ksm-kernel-shared-memory-driver-checkpatch-fixes.patch page-allocator-do-not-sanity-check-order-in-the-fast-path-fix.patch page-allocator-calculate-the-preferred-zone-for-allocation-only-once-fix.patch page-allocator-remove-a-branch-by-assuming-__gfp_high-==-alloc_high.patch videobuf-dma-contig-zero-copy-userptr-support-v3-comments-checkpatch-fixes.patch page-allocator-warn-if-__gfp_nofail-is-used-for-a-large-allocation.patch mm-pm-freezer-disable-oom-killer-when-tasks-are-frozen.patch page-allocator-clean-up-functions-related-to-pages_min-checkpatch-fixes.patch page-allocator-add-inactive-ratio-calculation-function-of-each-zone-checkpatch-fixes.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch m68k-count-can-reach-51-not-50.patch headers-move-module_bug_finalize-module_bug_cleanup-definitions-into-moduleh.patch remove-put_cpu_no_resched-fix.patch rb_tree-reorganize-code-in-rb_erase-for-additional-changes-checkpatch-fixes.patch proc-merge-arrayc-into-basec-checkpatch-fixes.patch serial-jsm-correctly-support-4-8-port-boards.patch serial-jsm-correctly-support-4-8-port-boards-fix.patch radeon-p2g2clk_always_onb-tested-twice-should-2nd-be-p2g2clk_dac_always_onb-fix.patch documentation-changes-perl-is-needed-to-build-the-kernel-fix.patch drivers-char-memc-memory_open-cleanup-lookup-minor-device-number-from-devlist-checkpatch-fixes.patch edac-add-cpc925-memory-controller-driver-cleanup.patch edac-add-edac_device_alloc_index-cleanup.patch dma-mapping-add-asm-generic-dma-mapping-commonh-fix.patch dma-mapping-add-asm-generic-dma-mapping-commonh-fix-fix.patch kexec-sysrq-simplify-sysrq-c-handler.patch gru-support-for-asynchronous-gru-instructions-fix.patch reiser4-export-remove_from_page_cache-fix.patch reiser4.patch reiser4-remove-simple_prepare_write-usage-checkpatch-fixes.patch slab-leaks3-default-y.patch put_bh-debug.patch shrink_slab-handle-bad-shrinkers.patch getblk-handle-2tb-devices.patch getblk-handle-2tb-devices-fix.patch undeprecate-pci_find_device.patch notify_change-callers-must-hold-i_mutex.patch