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: Thu, 10 Jul 2014 12:21:28 -0700 Message-ID: <53bee7b8.8cAimhMaE0fWxt/5%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-qc0-f202.google.com ([209.85.216.202]:58375 "EHLO mail-qc0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752622AbaGJTVa (ORCPT ); Thu, 10 Jul 2014 15:21:30 -0400 Received: by mail-qc0-f202.google.com with SMTP id x13so7733qcv.1 for ; Thu, 10 Jul 2014 12:21:29 -0700 (PDT) Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: akpm@linux-foundation.org, mm-commits@vger.kernel.org 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 --- fs/f2fs/namei.c | 4 ---- 1 file changed, 4 deletions(-) diff -puN fs/f2fs/namei.c~linux-next-git-rejects fs/f2fs/namei.c --- a/fs/f2fs/namei.c~linux-next-git-rejects +++ a/fs/f2fs/namei.c @@ -470,10 +470,6 @@ static int f2fs_rename(struct inode *old return 0; put_out_dir: -<<<<<<< HEAD -======= - f2fs_unlock_op(sbi); ->>>>>>> linux-next/akpm-base kunmap(new_page); f2fs_put_page(new_page, 0); out_dir: _ Patches currently in -mm which might be from akpm@linux-foundation.org are i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch maintainers-akpm-maintenance.patch revert-fs-seq_file-fallback-to-vmalloc-allocation.patch input-route-kbd-leds-through-the-generic-leds-layer.patch kbuild-explain-stack-protector-strong-config-logic.patch ocfs2-free-inode-when-i_count-becomes-zero-checkpatch-fixes.patch mm.patch slub-use-new-node-functions-checkpatch-fixes.patch slab-use-get_node-and-kmem_cache_node-functions-fix-2.patch slab-use-get_node-and-kmem_cache_node-functions-fix-2-fix.patch slab-change-int-to-size_t-for-representing-allocation-size.patch mm-page_allocc-unexport-alloc_pages_exact_nid.patch dma-cma-support-arbitrary-bitmap-granularity-fix.patch mm-vmallocc-add-a-schedule-point-to-vmalloc-fix.patch include-linux-mmdebugh-add-vm_warn_once.patch mm-catch-memory-commitment-underflow-fix.patch mm-hugetlb-generalize-writes-to-nr_hugepages-fix.patch mm-introduce-do_shared_fault-and-drop-do_fault-fix-fix.patch mm-compactionc-isolate_freepages_block-small-tuneup.patch mm-zpool-implement-common-zpool-api-to-zbud-zsmalloc-fix.patch mm-zpool-prevent-zbud-zsmalloc-from-unloading-when-used-checkpatch-fixes.patch do_shared_fault-check-that-mmap_sem-is-held.patch list-fix-order-of-arguments-for-hlist_add_after_rcu-checkpatch-fixes.patch add-lib-globc-fix.patch lib-list_sortc-convert-to-pr_foo.patch lib-list_sortc-convert-to-pr_foo-fix.patch checkpatch-add-test-for-commit-id-formatting-style-in-commit-log.patch binfmt_elfc-use-get_random_int-to-fix-entropy-depleting-fix.patch fs-isofs-logging-clean-up-fix.patch proc-remove-proc_tty_ldisc-variable-fix.patch kexec-implementation-of-new-syscall-kexec_file_load-checkpatch-fixes.patch kexec-support-kexec-kdump-on-efi-systems-fix.patch panic-add-taint_softlockup-fix.patch linux-next.patch drivers-gpio-gpio-zevioc-fix-build.patch drivers-staging-emxx_udc-emxx_udcc-replace-strict_strto-with-kstrto.patch kernel-posix-timersc-code-clean-up-checkpatch-fixes.patch mm-replace-remap_file_pages-syscall-with-emulation-fix.patch memcg-deprecate-memoryforce_empty-knob-fix.patch debugging-keep-track-of-page-owners.patch journal_add_journal_head-debug.patch journal_add_journal_head-debug-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch mutex-subsystem-synchro-test-module.patch slab-leaks3-default-y.patch put_bh-debug.patch