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, 30 Jul 2008 12:06:14 -0700 Message-ID: <200807301906.m6UJ6EvL010538@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:55011 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756528AbYG3TGe (ORCPT ); Wed, 30 Jul 2008 15:06:34 -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 m6UJ6EBj020967 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 30 Jul 2008 12:06:15 -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://www.zip.com.au/~akpm/linux/patches/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/kernel/genapic_64.c | 25 ------------------------- 1 file changed, 25 deletions(-) diff -puN arch/x86/kernel/genapic_64.c~linux-next-git-rejects arch/x86/kernel/genapic_64.c --- a/arch/x86/kernel/genapic_64.c~linux-next-git-rejects +++ a/arch/x86/kernel/genapic_64.c @@ -70,28 +70,3 @@ int __init acpi_madt_oem_check(char *oem } return 0; } -<<<<<<< HEAD:arch/x86/kernel/genapic_64.c - -unsigned int read_apic_id(void) -{ - unsigned int id; - - WARN_ON(preemptible() && num_online_cpus() > 1); - id = apic_read(APIC_ID); - if (uv_system_type >= UV_X2APIC) - id |= __get_cpu_var(x2apic_extra_bits); - return id; -} - -enum uv_system_type get_uv_system_type(void) -{ - return uv_system_type; -} - -int is_uv_system(void) -{ - return uv_system_type != UV_NONE; -} -EXPORT_SYMBOL_GPL(is_uv_system); -======= ->>>>>>> FETCH_HEAD:arch/x86/kernel/genapic_64.c _ Patches currently in -mm which might be from akpm@linux-foundation.org are origin.patch seq_file-fix-bug-when-seq_read-reads-nothing.patch linux-next.patch linux-next-git-rejects.patch next-remove-localversion.patch drivers-mtd-nand-nandsimc-needs-div64h.patch pci-make-pci_register_driver-a-macro.patch git-acpi.patch arch-x86-pci-irqc-attempt-to-clean-up-code-layout.patch ppc-use-the-common-ascii-hex-helpers-fix.patch powerpc-replace-__function__-with-__func__-checkpatch-fixes.patch verify_dynamic_kobject_allocation-dont-use-kmalloc.patch i2c-renesas-highlander-fpga-smbus-support.patch tick-schedc-suppress-needless-timer-reprogramming.patch drivers-input-serio-xilinx_ps2c-fix-warning.patch git-jg-misc.patch git-kvm.patch git-mtd.patch drivers-mtd-nand-nandsimc-fix-printk-warnings.patch drivers-mtd-nand-fsl_elbc_nandc-fix-printk-warning.patch bridge-send-correct-mtu-value-in-pmtu-checkpatch-fixes.patch sundance-set-carrier-status-on-link-change-events.patch cassini-use-request_firmware-fix.patch update-smc91x-driver-with-arm-versatile-board-info.patch git-battery.patch git-nfsd.patch sched-type-fix.patch scsi-gdthc-use-unaligned-access-helpers-checkpatch-fixes.patch git-block-git-rejects.patch git-unionfs.patch git-logfs-git-rejects.patch git-logfs-fixup.patch drivers-usb-class-cdc-acmc-use-correct-type-for-cpu-flags.patch drivers-usb-class-cdc-wdmc-fix-build-with-config_pm=n.patch drivers-net-wireless-iwlwifi-iwl-ledc-printk-fix.patch git-xtensa.patch drivers-telephony-ixjc-depends-on-pnp.patch scsi-dpt_i2o-is-bust-on-ia64.patch hwmon-adc124s501-generic-driver.patch drivers-net-netxen-netxen_nic_hwc-fix-printk-warnings.patch rcu-fix-synchronize_rcu-so-that-kernel-doc-works-comment.patch ftrace-disable-function-tracing-bringing-up-new-cpu-fix.patch unrevert-usb-dont-explicitly-reenable-root-hub-status-interrupts.patch vmscan-give-referenced-active-and-unmapped-pages-a-second-trip-around-the-lru.patch vm-dont-run-touch_buffer-during-buffercache-lookups.patch vmscan-move-isolate_lru_page-to-vmscanc.patch define-page_file_cache-function.patch vmscan-split-lru-lists-into-anon-file-sets.patch unevictable-lru-infrastructure.patch unevictable-lru-page-statistics.patch mlock-mlocked-pages-are-unevictable.patch mmap-handle-mlocked-pages-during-map-remap-unmap.patch vmscan-unevictable-lru-scan-sysctl.patch slb-drop-kmem-cache-argument-from-constructor-fix-fix-logfs.patch eink_apollofb-new-driver-for-apollo-eink-controller.patch devpts-switch-to-ida-checkpatch-fixes.patch getdelaysc-add-a-usr1-signal-handler-checkpatch-fixes.patch w1-feature-enable-hardware-strong-pullup-checkpatch-fixes.patch w1-ds2490c-add-support-for-strong-pullup-checkpatch-fixes.patch w1-ds2490c-optimize-ds_set_pullup-checkpatch-fixes.patch gcov-architecture-specific-compile-flag-adjustments-powerpc-moved-stuff.patch reiser4.patch reiser4-tree_lock-fixes.patch reiser4-tree_lock-fixes-fix.patch reiser4-semaphore-fix.patch slb-drop-kmem-cache-argument-from-constructor-reiser4.patch reiser4-suid.patch page-owner-tracking-leak-detector.patch nr_blockdev_pages-in_interrupt-warning.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 profile-likely-unlikely-macros.patch drivers-net-bonding-bond_sysfsc-suppress-uninitialized-var-warning.patch w1-build-fix.patch