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, 06 Dec 2016 11:17:34 -0800 Message-ID: <58470ece.TN32em8jz1z27gYV%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]:51140 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751495AbcLFTRf (ORCPT ); Tue, 6 Dec 2016 14:17:35 -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/crypto/chelsio/chcr_algo.h | 3 --- 1 file changed, 3 deletions(-) diff -puN drivers/crypto/chelsio/chcr_algo.h~linux-next-git-rejects drivers/crypto/chelsio/chcr_algo.h --- a/drivers/crypto/chelsio/chcr_algo.h~linux-next-git-rejects +++ a/drivers/crypto/chelsio/chcr_algo.h @@ -408,7 +408,6 @@ static u32 round_constant[11] = { 0x1B000000, 0x36000000, 0x6C000000 }; -<<<<<<< HEAD /* dec_key - OUTPUT - Reverse round key * key - INPUT - key * keylength - INPUT - length of the key in number of bits @@ -466,6 +465,4 @@ static inline void get_aes_decrypt_key(u } } -======= ->>>>>>> linux-next/akpm-base #endif /* __CHCR_ALGO_H__ */ _ Patches currently in -mm which might be from akpm@linux-foundation.org are i-need-old-gcc.patch arm-arch-arm-include-asm-pageh-needs-personalityh.patch prctl-remove-one-shot-limitation-for-changing-exe-link-fix.patch ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch mm.patch mm-compaction-allow-compaction-for-gfp_nofs-requests-fix.patch mm-mempolicy-clean-up-__gfp_thisnode-confusion-in-policy_zonelist-checkpatch-fixes.patch mm-disable-numa-migration-faults-for-dax-vmas-fix.patch filemap-add-comment-for-confusing-logic-in-page_cache_tree_insert-fix.patch include-linux-backing-dev-defsh-shrink-struct-backing_dev_info.patch mm-thp-page-cache-support-for-ppc64-fix.patch mm-rmap-handle-anon_vma_prepare-common-case-inline-checkpatch-fixes.patch scripts-checkpatchpl-fix-spelling.patch debug-more-properly-delay-for-secondary-cpus-fix.patch linux-next-rejects.patch drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch ipc-sem-rework-task-wakeups-checkpatch-fixes.patch ipc-sem-optimize-perform_atomic_semop-checkpatch-fixes.patch ipc-sem-simplify-wait-wake-loop-checkpatch-fixes.patch mm-unexport-__get_user_pages_unlocked-checkpatch-fixes.patch vfs-make-may_umount_tree-mount-propogation-aware-checkpatch-fixes.patch kernel-forkc-export-kernel_thread-to-modules.patch slab-leaks3-default-y.patch