From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + linux-next-git-rejects.patch added to -mm tree Date: Tue, 07 Feb 2017 13:01:21 -0800 Message-ID: <589a35a1.wA4NJHKhh50+PlZC%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]:51586 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932101AbdBGVKw (ORCPT ); Tue, 7 Feb 2017 16:10:52 -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 added to the -mm tree. Its filename is linux-next-git-rejects.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/linux-next-git-rejects.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/linux-next-git-rejects.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton Subject: linux-next-git-rejects Signed-off-by: Andrew Morton --- drivers/crypto/chelsio/chcr_core.c | 4 ---- 1 file changed, 4 deletions(-) diff -puN drivers/crypto/chelsio/chcr_core.c~linux-next-git-rejects drivers/crypto/chelsio/chcr_core.c --- a/drivers/crypto/chelsio/chcr_core.c~linux-next-git-rejects +++ a/drivers/crypto/chelsio/chcr_core.c @@ -61,11 +61,7 @@ int assign_chcr_device(struct chcr_dev * */ mutex_lock(&dev_mutex); /* TODO ? */ list_for_each_entry(u_ctx, &uld_ctx_list, entry) -<<<<<<< HEAD - if (u_ctx && u_ctx->dev) { -======= if (u_ctx->dev) { ->>>>>>> linux-next/akpm-base *dev = u_ctx->dev; ret = 0; break; _ 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 scripts-spellingtxt-fix-incorrect-typo-words-fix.patch ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch mm.patch slub-make-sysfs-directories-for-memcg-sub-caches-optional-fix.patch mm-throttle-show_mem-from-warn_alloc-fix.patch userfaultfd-hugetlbfs-fix-__mcopy_atomic_hugetlb-retry-error-processing-fix-fix.patch lib-show_memc-teach-show_mem-to-work-with-the-given-nodemask-checkpatch-fixes.patch mm-consolidate-gfp_nofail-checks-in-the-allocator-slowpath-fix.patch mm-ksm-improve-deduplication-of-zero-pages-with-colouring-fix.patch mm-track-active-portions-of-a-section-at-boot-fix.patch mm-memory_hotplugc-unexport-__remove_pages.patch z3fold-add-kref-refcounting-checkpatch-fixes.patch mm-convert-remove_migration_pte-to-use-page_vma_mapped_walk-checkpatch-fixes.patch linux-kernelh-fix-div_round_closest-to-support-negative-divisors-fix.patch linux-next-rejects.patch kernel-forkc-export-kernel_thread-to-modules.patch slab-leaks3-default-y.patch linux-next-git-rejects.patch