From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [obsolete] linux-next-git-rejects.patch removed from -mm tree Date: Tue, 20 Aug 2013 12:42:13 -0700 Message-ID: <5213c695.2meWOydBk3Q15mOt%akpm@linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-path: Received: from mail.linuxfoundation.org ([140.211.169.12]:36828 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751192Ab3HTTmO (ORCPT ); Tue, 20 Aug 2013 15:42:14 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org, akpm@linux-foundation.org Subject: [obsolete] linux-next-git-rejects.patch removed from -mm tree To: akpm@linux-foundation.org,mm-commits@vger.kernel.org From: akpm@linux-foundation.org Date: Tue, 20 Aug 2013 12:42:13 -0700 The patch titled Subject: linux-next-git-rejects has been removed from the -mm tree. Its filename was linux-next-git-rejects.patch This patch was dropped because it is obsolete ------------------------------------------------------ From: Andrew Morton Subject: linux-next-git-rejects Signed-off-by: Andrew Morton --- drivers/gpu/drm/i915/i915_gem_dmabuf.c | 4 ---- kernel/time/tick-sched.c | 8 -------- 2 files changed, 12 deletions(-) diff -puN drivers/gpu/drm/i915/i915_gem_dmabuf.c~linux-next-git-rejects drivers/gpu/drm/i915/i915_gem_dmabuf.c --- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c~linux-next-git-rejects +++ a/drivers/gpu/drm/i915/i915_gem_dmabuf.c @@ -90,11 +90,7 @@ static void i915_gem_unmap_dma_buf(struc struct sg_table *sg, enum dma_data_direction dir) { -<<<<<<< HEAD - struct drm_i915_gem_object *obj = attachment->dmabuf->priv; -======= struct drm_i915_gem_object *obj = dma_buf_to_obj(attachment->dmabuf); ->>>>>>> linux-next/akpm-base mutex_lock(&obj->base.dev->struct_mutex); diff -puN kernel/time/tick-sched.c~linux-next-git-rejects kernel/time/tick-sched.c --- a/kernel/time/tick-sched.c~linux-next-git-rejects +++ a/kernel/time/tick-sched.c @@ -183,11 +183,7 @@ static bool can_stop_full_tick(void) * Don't allow the user to think they can get * full NO_HZ with this machine. */ -<<<<<<< HEAD - WARN_ONCE(have_nohz_full_mask, -======= WARN_ONCE(tick_nohz_full_running, ->>>>>>> linux-next/akpm-base "NO_HZ FULL will not work with unstable sched clock"); return false; } @@ -341,13 +337,9 @@ static int tick_nohz_init_all(void) void __init tick_nohz_init(void) { -<<<<<<< HEAD - if (!have_nohz_full_mask) { -======= int cpu; if (!tick_nohz_full_running) { ->>>>>>> linux-next/akpm-base if (tick_nohz_init_all() < 0) return; } _ Patches currently in -mm which might be from akpm@linux-foundation.org are origin.patch linux-next.patch revert-include-linux-smph-on_each_cpu-switch-back-to-a-macro.patch arch-alpha-kernel-systblss-remove-debug-check.patch i-need-old-gcc.patch block-support-embedded-device-command-line-partition.patch mm.patch swap-warn-when-a-swap-area-overflows-the-maximum-size-fix.patch mm-swapfilec-convert-to-pr_foo.patch mm-vmstats-track-tlb-flush-stats-on-up-too-fix.patch swap-make-swap-discard-async-checkpatch-fixes.patch swap-make-cluster-allocation-per-cpu-checkpatch-fixes.patch mm-page_alloc-restructure-free-page-stealing-code-and-fix-a-bug-fix.patch mm-hugetlb-decrement-reserve-count-if-vm_noreserve-alloc-page-cache-fix.patch mm-mempolicy-return-null-if-node-is-numa_no_node-in-get_task_policy.patch vmstat-create-separate-function-to-fold-per-cpu-diffs-into-local-counters-fix.patch genalloc-fix-overflow-of-ending-address-of-memory-chunk-fix.patch mm-use-zone_end_pfn-instead-of-zone_start_pfnspanned_pages-fix.patch mm-hotplug-verify-hotplug-memory-range-fix.patch mm-fix-aio-performance-regression-for-database-caused-by-thp-fix.patch mm-munlock-bypass-per-cpu-pvec-for-putback_lru_page-fix.patch lib-crc32-update-the-comments-of-crc32_bele_generic-checkpatch-fixes.patch binfmt_elfc-use-get_random_int-to-fix-entropy-depleting.patch fat-additions-to-support-fat_fallocate-fix.patch move-exit_task_namespaces-outside-of-exit_notify-fix.patch initmpfs-move-bdi-setup-from-init_rootfs-to-init_ramfs-fix.patch initmpfs-use-initramfs-if-rootfstype=-or-root=-specified-checkpatch-fixes.patch ipc-drop-ipcctl_pre_down-fix.patch ipcshm-make-shmctl_nolock-lockless-checkpatch-fixes.patch revert-selinux-do-not-handle-seclabel-as-a-special-flag.patch memcg-trivial-cleanups.patch shrinker-convert-superblock-shrinkers-to-new-api-fix.patch xfs-convert-buftarg-lru-to-generic-code-fix.patch xfs-convert-dquot-cache-lru-to-list_lru-fix.patch fs-convert-fs-shrinkers-to-new-scan-count-api-fix.patch fs-convert-fs-shrinkers-to-new-scan-count-api-fix-fix-2.patch drivers-convert-shrinkers-to-new-count-scan-api-fix.patch drivers-convert-shrinkers-to-new-count-scan-api-fix-2.patch shrinker-convert-remaining-shrinkers-to-count-scan-api-fix.patch hugepage-convert-huge-zero-page-shrinker-to-new-shrinker-api-fix.patch shrinker-kill-old-shrink-api-fix.patch debugging-keep-track-of-page-owners-fix-2-fix.patch debugging-keep-track-of-page-owners-fix-2-fix-fix-fix.patch journal_add_journal_head-debug.patch kernel-forkc-export-kernel_thread-to-modules.patch mutex-subsystem-synchro-test-module.patch slab-leaks3-default-y.patch put_bh-debug.patch