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: Mon, 09 Feb 2015 11:48:17 -0800 Message-ID: <54d90f01.DNDZTVchAQ1OYYYP%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]:54242 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759779AbbBITsS (ORCPT ); Mon, 9 Feb 2015 14:48:18 -0500 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 --- drivers/net/vxlan.c | 5 ----- 1 file changed, 5 deletions(-) diff -puN drivers/net/vxlan.c~linux-next-git-rejects drivers/net/vxlan.c --- a/drivers/net/vxlan.c~linux-next-git-rejects +++ a/drivers/net/vxlan.c @@ -2761,10 +2761,6 @@ static int vxlan_newlink(struct net *src nla_get_u8(data[IFLA_VXLAN_UDP_ZERO_CSUM6_RX])) vxlan->flags |= VXLAN_F_UDP_ZERO_CSUM6_RX; -<<<<<<< HEAD - if (vxlan_find_vni(src_net, vni, use_ipv6 ? AF_INET6 : AF_INET, - vxlan->dst_port)) { -======= if (data[IFLA_VXLAN_REMCSUM_TX] && nla_get_u8(data[IFLA_VXLAN_REMCSUM_TX])) vxlan->flags |= VXLAN_F_REMCSUM_TX; @@ -2778,7 +2774,6 @@ static int vxlan_newlink(struct net *src if (vxlan_find_vni(src_net, vni, use_ipv6 ? AF_INET6 : AF_INET, vxlan->dst_port, vxlan->flags)) { ->>>>>>> linux-next/akpm-base pr_info("duplicate VNI %u\n", vni); return -EEXIST; } _ 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 fanotify-dont-recalculate-a-marks-mask-if-only-the-ignored-mask-changed-checkpatch-fixes.patch fanotify-dont-set-fan_ondir-implicitly-on-a-marks-ignored-mask-checkpatch-fixes.patch input-route-kbd-leds-through-the-generic-leds-layer.patch o2dlm-fix-null-pointer-dereference-in-o2dlm_blocking_ast_wrapper.patch mm.patch mm-vmstatc-fix-cleanup-ifdefs.patch mm-replace-remap_file_pages-syscall-with-emulation.patch mm-drop-vm_ops-remap_pages-and-generic_file_remap_pages-stub-fix.patch mm-page_allocc-__alloc_pages_nodemask-dont-alter-arg-gfp_mask.patch vmscan-force-scan-offline-memory-cgroups-fix.patch mm-memcontrol-default-hierarchy-interface-for-memory.patch mm-memcontrol-fold-move_anon-and-move_file-fix.patch fs-shrinker-always-scan-at-least-one-object-of-each-type-fix.patch mm-compaction-enhance-tracepoint-output-for-compaction-begin-end-v4-fix.patch mm-vmscan-fix-the-page-state-calculation-in-too_many_isolated-fix.patch mm-thp-allocate-transparent-hugepages-on-local-node-fix.patch docs-procs-describe-proc-pid-map_files-entry-fix.patch mm-page_ext-remove-unnecessary-stack_trace-field-fix.patch mm-fix-arithmetic-overflow-in-__vm_enough_memory-fix.patch x86-add-pmd_-for-thp-fix.patch sparc-add-pmd_-for-thp-fix.patch zram-rework-reset-and-destroy-path-fix.patch task_mmu-add-user-space-support-for-resetting-mm-hiwater_rss-peak-rss.patch powerpc-add-running_clock-for-powerpc-to-prevent-spurious-softlockup-warnings-checkpatch-fixes.patch kernelh-remove-ancient-__function__-hack-fix.patch lib-bitmap-update-bitmap_onto-to-unsigned-checkpatch-fixes.patch lib-bitmap-change-parameters-of-bitmap_fold-to-unsigned-fix.patch hexdump-makes-it-return-amount-of-bytes-placed-in-buffer-fix.patch mm-slab-convert-cache-name-allocations-to-kstrdup_const-fix.patch module_device_table-fix-some-callsites.patch kasan-enable-instrumentation-of-global-variables-fix.patch kasan-enable-instrumentation-of-global-variables-fix-2-fix.patch rtc-rk808-fix-the-rtc-time-reading-issue-fix.patch fs-befs-linuxvfsc-remove-unnecessary-casting-fix.patch samples-seccomp-improve-label-helper-fix.patch linux-next.patch linux-next-rejects.patch mm-fix-xip-fault-vs-truncate-race-fix.patch mm-fix-xip-fault-vs-truncate-race-fix-fix.patch mm-allow-page-fault-handlers-to-perform-the-cow-fix.patch mm-allow-page-fault-handlers-to-perform-the-cow-fix-fix-3.patch mm-allow-page-fault-handlers-to-perform-the-cow-fix-fix.patch daxext2-replace-the-xip-page-fault-handler-with-the-dax-page-fault-handler-fix.patch daxext2-replace-the-xip-page-fault-handler-with-the-dax-page-fault-handler-fix-2.patch daxext2-replace-the-xip-page-fault-handler-with-the-dax-page-fault-handler-fix-3.patch dax-add-dax_zero_page_range-fix.patch ext4-add-dax-functionality-fix.patch ocfs2-add-functions-to-add-and-remove-inode-in-orphan-dir-fix.patch ocfs2-implement-ocfs2_direct_io_write-fix.patch lib-kconfig-fix-up-have_arch_bitreverse-help-text.patch do_shared_fault-check-that-mmap_sem-is-held.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