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: Thu, 14 Oct 2010 13:05:46 -0700 Message-ID: <201010142004.o9EK4RPS016250@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:32848 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755104Ab0JNUE3 (ORCPT ); Thu, 14 Oct 2010 16:04:29 -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 o9EK4St5031838 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 14 Oct 2010 13:04:28 -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 --- drivers/gpu/drm/radeon/r600_blit_kms.c | 3 --- 1 file changed, 3 deletions(-) diff -puN drivers/gpu/drm/radeon/r600_blit_kms.c~linux-next-git-rejects drivers/gpu/drm/radeon/r600_blit_kms.c --- a/drivers/gpu/drm/radeon/r600_blit_kms.c~linux-next-git-rejects +++ a/drivers/gpu/drm/radeon/r600_blit_kms.c @@ -533,9 +533,7 @@ int r600_blit_init(struct radeon_device memcpy(ptr + rdev->r600_blit.ps_offset, r6xx_ps, r6xx_ps_size * 4); radeon_bo_kunmap(rdev->r600_blit.shader_obj); radeon_bo_unreserve(rdev->r600_blit.shader_obj); -<<<<<<< HEAD rdev->mc.active_vram_size = rdev->mc.real_vram_size; -======= done: r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false); @@ -548,7 +546,6 @@ done: dev_err(rdev->dev, "(%d) pin blit object failed\n", r); return r; } ->>>>>>> FETCH_HEAD return 0; } _ Patches currently in -mm which might be from akpm@linux-foundation.org are origin.patch linux-next.patch linux-next-git-rejects.patch next-remove-localversion.patch fs-inodec-work-around-bug.patch arch-x86-kernel-entry_64s-fix-build-with-gas-2161.patch arch-x86-kernel-entry_32s-i386-too.patch i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch mm-vmap-area-cache.patch arch-mips-include-asm-fcntlh-needs-typesh.patch gcc-46-btrfs-clean-up-unused-variables-bugs.patch drivers-gpu-drm-radeon-atomc-fix-warning.patch drivers-media-video-cx23885-cx23885-corec-fix-cx23885_dev_checkrevision.patch fs-notify-fanotify-fanotify_userc-fix-warnings.patch leds-route-kbd-leds-through-the-generic-leds-layer.patch backlight-add-low-threshold-to-pwm-backlight.patch serial8250-ratelimit-too-much-work-error-fix.patch serial8250-ratelimit-too-much-work-error-fix-fix.patch sched-make-sched_param-argument-static-variables-in-some-sched_setscheduler-caller.patch drivers-message-fusion-mptsasc-fix-warning.patch drivers-block-aoe-aoeblkc-ratelimit-a-warning-printk.patch vfs-allow-mnt_want_write-to-sleep-fix.patch mm.patch oom-kill-all-threads-sharing-oom-killed-tasks-mm-fix.patch oom-kill-all-threads-sharing-oom-killed-tasks-mm-fix-fix.patch oom-rewrite-error-handling-for-oom_adj-and-oom_score_adj-tunables.patch oom-fix-locking-for-oom_adj-and-oom_score_adj.patch mm-only-build-per-node-scan_unevictable-functions-when-numa-is-enabled-cleanup.patch memory-hotplug-unify-is_removable-and-offline-detection-code-checkpatch-fixes.patch mm-stack-based-kmap_atomic-checkpatch-fixes.patch mm-stack-based-kmap_atomic-fix.patch rmap-make-anon_vma_free-static-fix.patch vmstat-include-compactionh-when-config_compaction-fix.patch fs-fs-writebackc-restore-lost-comment.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch hpet-factor-timer-allocate-from-open.patch hpet-factor-timer-allocate-from-open-fix.patch kernelh-add-minmax3-macros-fix.patch include-linux-kernelh-add-__must_check-to-strict_strto.patch printk-declare-printk_ratelimit_state-in-ratelimith-fix.patch vsprintfc-use-default-pointer-field-size-for-null-strings-fix.patch scripts-get_maintainerpl-add-git-blame-rolestats-authored-lines-information.patch idr-fix-idr_pre_get-locking-description-fix.patch checkpatch-returning-errno-typically-should-be-negative.patch select-rename-estimate_accuracy-to-select_estimate_accuracy.patch vcs-add-poll-fasync-support-fix-fix.patch rtc-rtc-s3c-fix-access-unit-from-byte-to-word-on-rtccon-checkpatch-fixes.patch cgroup_freezer-update_freezer_state-does-incorrect-state-transitions-checkpatch-fixes.patch memcg-cpu-hotplug-aware-quick-acount_move-detection-checkpatch-fixes.patch core_pattern-fix-long-parameters-was-truncated-by-core_pattern-handler-update.patch core_pattern-fix-long-parameters-was-truncated-by-core_pattern-handler-update-2.patch core_pattern-fix-long-parameters-was-truncated-by-core_pattern-handler-update-2-checkpatch-fixes.patch drivers-char-hvc_consolec-remove-unneeded-__set_current_statetask_running.patch delay-accounting-re-implement-c-for-getdelaysc-to-report-information-on-a-target-command-checkpatch-fixes.patch fuse-use-release_pages.patch pps-add-async-pps-event-handler-fix.patch memstick-add-driver-for-ricoh-r5c592-card-reader-fix.patch kernel-resourcec-handle-reinsertion-of-an-already-inserted-resource.patch ramoops-use-the-platform-data-structure-instead-of-module-params-fix.patch journal_add_journal_head-debug.patch slab-leaks3-default-y.patch put_bh-debug.patch getblk-handle-2tb-devices.patch memblock-add-input-size-checking-to-memblock_find_region.patch memblock-add-input-size-checking-to-memblock_find_region-fix.patch