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: Fri, 19 Dec 2008 13:31:05 -0800 Message-ID: <200812192147.mBJLl4KD015197@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:57882 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751412AbYLSVrg (ORCPT ); Fri, 19 Dec 2008 16:47:36 -0500 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 mBJLl4pv015294 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 19 Dec 2008 13:47:05 -0800 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 --- drivers/md/bitmap.c | 5 ----- 1 file changed, 5 deletions(-) diff -puN drivers/md/bitmap.c~linux-next-git-rejects drivers/md/bitmap.c --- a/drivers/md/bitmap.c~linux-next-git-rejects +++ a/drivers/md/bitmap.c @@ -215,11 +215,6 @@ static struct page *read_sb_page(mddev_t /* choose a good rdev and read the page from there */ mdk_rdev_t *rdev; -<<<<<<< HEAD:drivers/md/bitmap.c - struct list_head *tmp; -======= - struct page *page = alloc_page(GFP_KERNEL); ->>>>>>> FETCH_HEAD:drivers/md/bitmap.c sector_t target; if (!page) _ Patches currently in -mm which might be from akpm@linux-foundation.org are mm-remove-the-might_sleep-from-lock_page.patch linux-next.patch next-remove-localversion.patch linux-next-git-rejects.patch fs-dlm-astc-fix-warning.patch linux-timexh-cleanup-for-userspace.patch drivers-input-touchscreen-ucb1400_tsc-needs-gpio.patch video-mbp_nvidia_bl-add-support-for-macbook-5-macbook-air-2-and-macbook-pro-5-fix.patch raw-fix-rawctl-compat-ioctls-breakage-on-amd64-and-itanic-checkpatch-fixes.patch scsi-dpt_i2o-is-bust-on-ia64.patch mm-invoke-oom-killer-from-page-fault-fix.patch mm-invoke-oom-killer-from-page-fault-fix-fix-2.patch mm-write_cache_pages-more-terminate-quickly.patch swapfile-change-discard-pgoff_t-to-sector_t-fix.patch fs-truncate-blocks-outside-i_size-after-o_direct-write-error-fix.patch vmscan-shrink_active_list-reduce-lru_lock-hold-time.patch page_fault-retry-with-nopage_retry-fix.patch page_fault-retry-with-nopage_retry-fix-fix.patch mm-mmapc-fix-coding-style-fix.patch init-properly-placing-noinline-keyword.patch add-pr_prefix-to-pr_xyz-macros-checkpatch-fixes.patch poll-allow-f_op-poll-to-sleep-take6.patch ioc4-automatically-load-sgiioc4-subordinate-module-checkpatch-fixes.patch smp_call_function_single-be-slightly-less-stupid.patch kernel-hrtimerc-kill-warning.patch binfmtsh-include-listh-fix.patch spi_gpio-driver-cleanups.patch kprobes-support-probing-module-__exit-function-fix.patch kprobes-support-probing-module-__exit-function-fix-2.patch nfs-optimize-attribute-timeouts-for-noac-and-actimeo=0-checkpatch-fixes.patch nfs-optimize-attribute-timeouts-for-noac-and-actimeo=0-checkpatch-fixes-checkpatch-fixes.patch rtc-au1000-on-chip-counter0-as-rtc-driver-fix.patch cgroups-skip-processes-from-other-namespaces-when-listing-a-cgroup-checkpatch-fixes.patch memcg-introduce-charge-commit-cancel-style-of-functions-fix.patch memcg-new-force_empty-to-free-pages-under-group-fix-fix.patch memcg-swap-cgroup-for-remembering-usage.patch memory-cgroup-resource-counters-for-hierarchy-v4-checkpatch-fixes.patch memory-cgroup-hierarchical-reclaim-v4-checkpatch-fixes.patch memcg-avoid-unnecessary-system-wide-oom-killer-fix.patch edac-struct-device-replace-bus_id-with-dev_name-dev_set_name-checkpatch-fixes.patch edac-x38-use-the-architectures-readq-function-fix.patch edac-x38-use-the-architectures-readq-function-fix-fix.patch parport-ieee1284-use-del_timer_sync-in-parport_wait_event-checkpatch-fixes.patch w1-allow-master-io-commands-fix.patch romfs-romfs_iget-unsigned-ino-=-0-is-always-true-checkpatch-fixes.patch filesystem-freeze-implement-generic-freeze-feature-fix.patch nilfs2-inode-operations-fix.patch nilfs2-pathname-operations-fix.patch nilfs2-super-block-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 reiser4-remove-simple_prepare_write-usage-checkpatch-fixes.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 drivers-net-bonding-bond_sysfsc-suppress-uninitialized-var-warning.patch w1-build-fix.patch