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, 17 Apr 2014 11:31:34 -0700 Message-ID: <53501e06.86hPInVVsc3AxemY%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]:59243 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751454AbaDQSbf (ORCPT ); Thu, 17 Apr 2014 14:31:35 -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: Thu, 17 Apr 2014 11:31:34 -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 --- net/ipv4/xfrm4_output.c | 4 ---- 1 file changed, 4 deletions(-) diff -puN net/ipv4/xfrm4_output.c~linux-next-git-rejects net/ipv4/xfrm4_output.c --- a/net/ipv4/xfrm4_output.c~linux-next-git-rejects +++ a/net/ipv4/xfrm4_output.c @@ -80,11 +80,7 @@ int xfrm4_output_finish(struct sk_buff * return xfrm_output(skb); } -<<<<<<< HEAD -int xfrm4_output(struct sock *sk, struct sk_buff *skb) -======= static int __xfrm4_output(struct sk_buff *skb) ->>>>>>> linux-next/akpm-base { struct xfrm_state *x = skb_dst(skb)->xfrm; _ Patches currently in -mm which might be from akpm@linux-foundation.org are arch-alpha-kernel-systblss-remove-debug-check.patch i-need-old-gcc.patch maintainers-akpm-maintenance.patch kernel-watchdogc-touch_softlockup_watchdog-use-raw_cpu_write.patch wait-explain-the-shadowing-and-type-inconsistencies.patch mips-export-flush_icache_range-fix.patch input-route-kbd-leds-through-the-generic-leds-layer.patch ocfs2-do-not-return-dlm_migrate_response_mastery_ref-to-avoid-endlessloop-during-umount.patch mm.patch mm-hugetlbfs-fix-rmapping-for-anonymous-hugepages-with-page_pgoff-v3-fix.patch pagewalk-update-page-table-walker-core-fix-end-address-calculation-in-walk_page_range-fix.patch pagemap-redefine-callback-functions-for-page-table-walker-fix.patch pagewalk-remove-argument-hmask-from-hugetlb_entry-fix-fix.patch mm-introduce-do_shared_fault-and-drop-do_fault-fix-fix.patch mm-compactionc-isolate_freepages_block-small-tuneup.patch mm-huge_memoryc-complete-conversion-to-pr_foo.patch include-linux-mmdebugh-add-vm_warn_on-and-vm_warn_on_once.patch mm-mempool-warn-about-__gfp_zero-usage-fix.patch mm-pass-vm_bug_on-reason-to-dump_page-fix.patch do_shared_fault-check-that-mmap_sem-is-held.patch init-mainc-dont-use-pr_debug.patch init-mainc-add-initcall_blacklist-kernel-parameter-fix.patch linux-next.patch drivers-gpio-gpio-zevioc-fix-build.patch ufs-sb-mutex-merge-mutex_destroy.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