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: Sun, 21 Sep 2008 23:53:34 -0700 Message-ID: <200809220653.m8M6rYVt028039@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:49848 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750764AbYIVGxh (ORCPT ); Mon, 22 Sep 2008 02:53:37 -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 m8M6rYI0015498 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sun, 21 Sep 2008 23:53:35 -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/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 --- MAINTAINERS | 5 ----- arch/x86/kernel/cpu/common.c | 6 ------ arch/x86/kernel/setup.c | 3 --- 3 files changed, 14 deletions(-) diff -puN arch/x86/kernel/cpu/common.c~linux-next-git-rejects arch/x86/kernel/cpu/common.c --- a/arch/x86/kernel/cpu/common.c~linux-next-git-rejects +++ a/arch/x86/kernel/cpu/common.c @@ -552,18 +552,12 @@ void __init early_cpu_init(void) * The NOPL instruction is supposed to exist on all CPUs with * family >= 6; unfortunately, that's not true in practice because * of early VIA chips and (more importantly) broken virtualizers that -<<<<<<< HEAD:arch/x86/kernel/cpu/common.c - * are not easy to detect. In the latter case it doesn't even *fail* - * reliably, so probing for it doesn't even work. Disable it completely - * unless we can find a reliable way to detect all the broken cases. -======= * are not easy to detect. Hence, probe for it based on first * principles. * * Note: no 64-bit chip is known to lack these, but put the code here * for consistency with 32 bits, and to make it utterly trivial to * diagnose the problem should it ever surface. ->>>>>>> FETCH_HEAD:arch/x86/kernel/cpu/common.c */ static void __cpuinit detect_nopl(struct cpuinfo_x86 *c) { diff -puN arch/x86/kernel/setup.c~linux-next-git-rejects arch/x86/kernel/setup.c --- a/arch/x86/kernel/setup.c~linux-next-git-rejects +++ a/arch/x86/kernel/setup.c @@ -909,12 +909,9 @@ void __init setup_arch(char **cmdline_p) #else num_physpages = max_pfn; -<<<<<<< HEAD:arch/x86/kernel/setup.c -======= check_efer(); if (cpu_has_x2apic) check_x2apic(); ->>>>>>> FETCH_HEAD:arch/x86/kernel/setup.c /* How many end-of-memory variables you have, grandma! */ /* need this before calling reserve_initrd */ diff -puN MAINTAINERS~linux-next-git-rejects MAINTAINERS --- a/MAINTAINERS~linux-next-git-rejects +++ a/MAINTAINERS @@ -3701,14 +3701,9 @@ M: jmorris@namei.org P: Eric Paris M: eparis@parisplace.org L: linux-kernel@vger.kernel.org (kernel issues) -<<<<<<< HEAD:MAINTAINERS -L: selinux@tycho.nsa.gov (subscribers-only, general discussion) -W: http://www.nsa.gov/selinux -======= L: selinux@tycho.nsa.gov (subscribers-only, general discussion) W: http://selinuxproject.org T: git kernel.org:pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git ->>>>>>> FETCH_HEAD:MAINTAINERS S: Supported SENSABLE PHANTOM _ Patches currently in -mm which might be from akpm@linux-foundation.org are mm-tiny-shmem-fix-lor-mmap_sem-vs-i_mutex-checkpatch-fixes.patch documentation-sysctl-kerneltxt-fix-softlockup_thresh-description.patch linux-next.patch next-remove-localversion.patch linux-next-git-rejects.patch drivers-mfd-ucb1400_corec-needs-gpio.patch drivers-mfd-ucb1400_corec-further-unbork.patch revert-acpi-ec-do-transaction-from-interrupt-context.patch acpi-catch-calls-of-acpi_driver_data-on-pointer-of-wrong-type-fix.patch acpi-catch-calls-of-acpi_driver_data-on-pointer-of-wrong-type-fix-fix.patch acpi-catch-calls-of-acpi_driver_data-on-pointer-of-wrong-type-fix-fix-fix.patch acpi-catch-calls-of-acpi_driver_data-on-pointer-of-wrong-type-fix-fix-fix-fix.patch acpi-catch-calls-of-acpi_driver_data-on-pointer-of-wrong-type-fix-fix-fix-fix-fix.patch fix-x86-sparse_irq-needs-spin_lock-in-allocations.patch zero-based-percpu-use-vmlinux_symbol-in-include-asm-generic-vmlinuxldsh.patch arch-x86-kernel-early_printkc-remove-unused-enable_debug_console.patch git-alsa-tiwai.patch git-powerpc.patch git-drm.patch drivers-media-video-tda9840c-unbreak.patch git-dlm.patch git-hid.patch tick-schedc-suppress-needless-timer-reprogramming.patch drivers-input-touchscreen-ucb1400_tsc-needs-gpio.patch git-jg-misc.patch git-kvm.patch led-driver-for-leds-on-pcengines-alix2-and-alix3-boards.patch libata-blackfin-pata-driver-add-proper-pm-operation-into-atapi-driver-fix.patch git-async-tx.patch drivers-dma-dmatestc-switch-a-gfp_atomic-to-gfp_kernel.patch git-mtd.patch sundance-set-carrier-status-on-link-change-events.patch cassini-use-request_firmware.patch e1000e-avoid-duplicated-output-of-device-name-in-kernel-warning-checkpatch-fixes.patch e1000e-avoid-duplicated-output-of-device-name-in-kernel-warning-fix.patch drivers-net-sfc-falconc-fix-min-warnings.patch backlight-driver-for-tabletkiosk-sahara-touchit-213-tablet-pc.patch backlight-driver-for-tabletkiosk-sahara-touchit-213-tablet-pc-update-2-checkpatch-fixes.patch git-battery.patch fix-cred-wrap-current-cred-and-a-few-other-accessors-on-mips.patch git-pci-next.patch sched-clarify-ifdef-tangle.patch scsi-gdthc-use-unaligned-access-helpers.patch drivers-scsi-device_handler-scsi_dh_emcc-suppress-warning.patch drivers-rtc-kconfig-dont-build-rtc-cmoso-on-sparc32.patch drivers-usb-musb-disable-it-on-superh.patch introduce-new-lsm-hooks-where-vfsmount-is-available-fix.patch git-watchdog.patch git-xtensa.patch scsi-dpt_i2o-is-bust-on-ia64.patch acpi-cope-with-pnpacpi-tables-missing-an-rtc-entry-fix.patch drivers-media-video-cafe_ccicc-needs-mmh.patch e1000e-prevent-corruption-of-eeprom-nvm.patch drivers-net-mlx4-allocc-needs-mmh.patch net-forcedeth-call-restore-mac-addr-in-nv_shutdown-path-v2.patch mm-page_allocc-free_area_init_nodes-fix-inappropriate-use-of-enum.patch mm-cleanup-to-make-remove_memory-arch-neutral-fix.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 mlock-mlocked-pages-are-unevictable-fix.patch mmap-handle-mlocked-pages-during-map-remap-unmap.patch mmap-handle-mlocked-pages-during-map-remap-unmap-mlock-resubmit-locked_vm-adjustment-as-separate-patch-fix.patch vmscan-unevictable-lru-scan-sysctl.patch mlock-make-mlock-error-return-posixly-correct-fix.patch mm-rewrite-vmap-layer-fix.patch mm-rewrite-vmap-layer-fix-fix.patch mm-rewrite-vmap-layer-fix-fix-fix.patch h8300-generic_bug-support-checkpatch-fixes.patch pm-rework-disabling-of-user-mode-helpers-during-suspend-hibernation-cleanup.patch container-freezer-add-tif_freeze-flag-to-all-architectures-fix.patch container-freezer-implement-freezer-cgroup-subsystem-checkpatch-fixes.patch container-freezer-implement-freezer-cgroup-subsystem-uninline-thaw_process-fix.patch eeepc-laptop-use-standard-interfaces-fix-fix.patch separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-fix.patch separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-fix-fix.patch fix-a-race-condtion-of-oops_in_progress-fix.patch make-taint-bit-reliable-v3-fix.patch kernel-sysc-improve-code-generation.patch compat-generic-compat-get-settimeofday-checkpatch-fixes.patch hwmon-pc87360-separate-alarm-files-add-in-min-max-alarms-cleanup.patch hwmon-pc87360-separate-alarm-files-add-temp-min-max-crit-fault-alarms-cleanup.patch hwmon-pc87360-separate-alarm-files-add-therm-min-max-crit-alarms-cleanup.patch drivers-hwmon-applesmcc-remove-unneeded-casts.patch allow-recursion-in-binfmt_script-and-binfmt_misc-fix.patch serial-make-uart_ports-ioport-unsigned-long-fix.patch autofs4-track-uid-and-gid-of-last-mount-requester-fix.patch autofs4-add-miscellaneous-device-for-ioctls-fix.patch autofs4-add-miscellaneous-device-for-ioctls-fix-2.patch autofs4-add-miscellaneous-device-for-ioctls-fix-fix-3.patch rtc-add-device-driver-for-dallas-ds3234-spi-rtc-chip-fix.patch fb-push-down-the-bkl-in-the-ioctl-handler-checkpatch-fixes.patch viafb-viafbmodes-viafbtxt-fix-fix.patch viafb-accelc-accelh-checkpatch-fixes.patch viafb-dvic-dvih-globalc-and-globalh-checkpatch-fixes.patch viafb-hwc-hwh-checkpatch-fixes.patch viafb-viafbdevc-viafbdevh-checkpatch-fixes.patch fbdev-kconfig-update-fix.patch eink_apollofb-new-driver-for-apollo-eink-controller.patch ext2-avoid-printk-floods-in-the-face-of-directory-corruption-checkpatch-fixes.patch ext3-fix-ext3_dx_readdir-hash-collision-handling-checkpatch-fixes.patch cgroups-fix-probable-race-with-put_css_set-and-find_css_set-fix.patch memrlimit-add-memrlimit-controller-accounting-and-control-mm_owner-fix-checkpatch-fixes.patch genirq-record-trigger-type-fix.patch message-queues-increase-range-limits-checkpatch-fixes.patch tty-fix-echo-tab-erase-and-locking-fix.patch applicomc-fix-apparently-broken-code-in-do_ac_read.patch drivers-char-tpm-tpmc-fix-error-patch-memory-leak.patch w1-be-able-to-manually-add-and-remove-slaves-fix.patch w1-new-driver-ds2431-chip-fix.patch gru-driver-minor-updates-fix.patch gcov-architecture-specific-compile-flag-adjustments-powerpc-moved-stuff.patch drivers-rtc-rtc-bq4802c-dont-use-bin_2_bcd-and-bcd_2_bin.patch x86-sysfs-kill-owner-field-from-attribute-fix.patch x86-sysfs-kill-owner-field-from-attribute-fix-fix.patch x86-sysfs-kill-owner-field-from-attribute-fix-3.patch nilfs2-inode-operations-fix.patch nilfs2-pathname-operations-fix.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 reiser4-track-upstream-changes.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