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: Wed, 11 Mar 2015 12:16:24 -0700 Message-ID: <55009488.w9MXQlHiAcNaj1uc%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]:48040 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751057AbbCKTQZ (ORCPT ); Wed, 11 Mar 2015 15:16:25 -0400 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/ethernet/rocker/rocker.c | 6 ------ 1 file changed, 6 deletions(-) diff -puN drivers/net/ethernet/rocker/rocker.c~linux-next-git-rejects drivers/net/ethernet/rocker/rocker.c --- a/drivers/net/ethernet/rocker/rocker.c~linux-next-git-rejects +++ a/drivers/net/ethernet/rocker/rocker.c @@ -1280,15 +1280,9 @@ static void rocker_port_set_enable(struc u64 val = rocker_read64(rocker_port->rocker, PORT_PHYS_ENABLE); if (enable) -<<<<<<< HEAD - val |= 1ULL << rocker_port->lport; - else - val &= ~(1ULL << rocker_port->lport); -======= val |= 1ULL << rocker_port->pport; else val &= ~(1ULL << rocker_port->pport); ->>>>>>> linux-next/akpm-base rocker_write64(rocker_port->rocker, PORT_PHYS_ENABLE, val); } _ 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 mm-fix-anon_vma-degree-underflow-in-anon_vma-endless-growing-prevention.patch mm.patch mm-cma-release-trigger-checkpatch-fixes.patch mm-cma-allocation-trigger-fix.patch mm-compaction-enhance-compaction-finish-condition-fix.patch page_writeback-cleanup-mess-around-cancel_dirty_page-checkpatch-fixes.patch mm-hide-per-cpu-lists-in-output-of-show_mem-fix.patch mm-clarify-__gfp_nofail-deprecation-status-checkpatch-fixes.patch mm-vmscan-fix-the-page-state-calculation-in-too_many_isolated.patch x86-add-pmd_-for-thp-fix.patch sparc-add-pmd_-for-thp-fix.patch zram-add-dynamic-device-add-remove-functionality-fix.patch zram-introduce-automatic-device_id-generation-fix.patch kernel-conditionally-support-non-root-users-groups-and-capabilities-checkpatch-fixes.patch lib-vsprintf-add-%pcnr-format-specifiers-for-clocks-fix.patch lib-find__bit-reimplementation-fix.patch binfmt_misc-simplify-entry_status-fix.patch rtc-add-abracon-abx80x-driver-fix.patch fs-fat-remove-unnecessary-includes-fix.patch kconfig-use-macros-which-are-already-defined-fix.patch linux-next.patch lib-kconfig-fix-up-have_arch_bitreverse-help-text.patch oprofile-reduce-mmap_sem-hold-for-mm-exe_file-fix.patch tomoyo-reduce-mmap_sem-hold-for-mm-exe_file-checkpatch-fixes.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