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: Mon, 25 Jul 2011 12:14:59 -0700 Message-ID: <201107251914.p6PJE8AT023294@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:37315 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751780Ab1GYTO5 (ORCPT ); Mon, 25 Jul 2011 15:14:57 -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 p6PJE8ZD021521 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 25 Jul 2011 12:14:08 -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/lguest/i386_head.S | 4 ---- 1 file changed, 4 deletions(-) diff -puN arch/x86/lguest/i386_head.S~linux-next-git-rejects arch/x86/lguest/i386_head.S --- a/arch/x86/lguest/i386_head.S~linux-next-git-rejects +++ a/arch/x86/lguest/i386_head.S @@ -21,11 +21,7 @@ * assigned number), then it calls us here. * * WARNING: be very careful here! We're running at addresses equal to physical -<<<<<<< HEAD * addresses (around 0), not above PAGE_OFFSET as most code expects -======= - * addesses (around 0), not above PAGE_OFFSET as most code expects ->>>>>>> quilt/rr * (eg. 0xC0000000). Jumps are relative, so they're OK, but we can't touch any * data without remembering to subtract __PAGE_OFFSET! * _ Patches currently in -mm which might be from akpm@linux-foundation.org are origin.patch headers_check-is-broken.patch samples-hidraw-is-busted.patch hugetlb-add-phys-addr-to-struct-huge_bootmem_page-fix.patch mm-use-const-struct-page-for-r-o-page-flag-accessor-methods-checkpatch-fixes.patch xtensa-prevent-arbitrary-read-in-ptrace-fix.patch linux-next.patch linux-next-git-rejects.patch linux-next-rejects.patch i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch cris-fix-a-build-error-in-kernel-forkc-checkpatch-fixes.patch kernel-timec-change-jiffies_to_clock_t-input-parameters-type-to-unsigned-long-fix.patch arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver-fix.patch drivers-video-backlight-aat2870_blc-make-it-buildable-as-a-module.patch pci-enumerate-the-pci-device-only-removed-out-pci-hierarchy-of-os-when-re-scanning-pci-fix.patch drivers-cdrom-cdromc-relax-check-on-dvd-manufacturer-value.patch drivers-staging-speakup-devsynthc-fix-buffer-size-is-not-provably-correct-error.patch drivers-staging-dt3155v4l-dt3155v4lc-needs-slabh.patch drivers-staging-solo6x10-corec-needs-slabh.patch drivers-staging-solo6x10-p2mc-needs-slabh.patch staging-more-missing-slabh-inclusions.patch slab-use-numa_no_node.patch mm.patch mm-extend-memory-hotplug-api-to-allow-memory-hotplug-in-virtual-machines-fix.patch pagewalk-add-locking-rule-comments-fix.patch mm-memoryc-remove-zap_block_size.patch mm-memblockc-avoid-abuse-of-red_inactive.patch mm-preallocate-page-before-lock_page-at-filemap-cow.patch mm-futex-fix-futex-writes-on-archs-with-sw-tracking-of-dirty-young-checkpatch-fixes.patch mm-futex-fix-futex-writes-on-archs-with-sw-tracking-of-dirty-young-fix.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch hpet-factor-timer-allocate-from-open.patch drivers-misc-add-support-the-fsa9480-usb-switch-fix.patch leds-route-kbd-leds-through-the-generic-leds-layer.patch lib-make-_tolower-public-checkpatch-fixes.patch checkpatch-suggest-using-min_t-or-max_t-v2.patch checkpatch-add-a-prefer-__aligned-check.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 init-skip-calibration-delay-if-previously-done-fix.patch init-skip-calibration-delay-if-previously-done-fix-fix.patch init-skip-calibration-delay-if-previously-done-4.patch drivers-rtc-add-support-for-qualcomm-pmic8xxx-rtc-fix.patch memcg-consolidates-memory-cgroup-lru-stat-functions-fix.patch cpusets-randomize-node-rotor-used-in-cpuset_mem_spread_node.patch cpusets-randomize-node-rotor-used-in-cpuset_mem_spread_node-fix-2.patch cpusets-randomize-node-rotor-used-in-cpuset_mem_spread_node-cpusets-initialize-spread-rotor-lazily-fix.patch h8300-m68k-xtensa-__fd_isset-should-return-0-1.patch proc-pid-fdinfo-add-cloexec-information-fix.patch ipc-introduce-shm_rmid_forced-sysctl-fix.patch ipc-introduce-shm_rmid_forced-sysctl-fix-2.patch ipc-introduce-shm_rmid_forced-sysctl-cleanup.patch ipc-introduce-shm_rmid_forced-sysctl-comments-fix.patch ipc-introduce-shm_rmid_forced-sysctl-testing.patch scatterlist-new-helper-functions.patch scatterlist-new-helper-functions-update-fix.patch kexec-remove-kmsg_dump_kexec.patch vmware-balloon-switch-to-using-sysem-wide-freezable-workqueue-fix.patch ramoops-use-module-parameters-instead-of-platform-data-if-not-available-checkpatch-fixes.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