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, 18 Jul 2017 12:26:18 -0700 Message-ID: <20170718192618.fSIOj4ZeC%akpm@linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from mail.linuxfoundation.org ([140.211.169.12]:39608 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751480AbdGRT0T (ORCPT ); Tue, 18 Jul 2017 15:26:19 -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 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 --- diff -puN drivers/infiniband/core/verbs.c~linux-next-git-rejects drivers/infiniband/core/verbs.c --- a/drivers/infiniband/core/verbs.c~linux-next-git-rejects +++ a/drivers/infiniband/core/verbs.c @@ -1298,11 +1298,7 @@ int ib_modify_qp_with_udata(struct ib_qp if (ret) return ret; } -<<<<<<< HEAD - return ib_security_modify_qp(qp, attr, attr_mask, udata); -======= return ib_security_modify_qp(qp->real_qp, attr, attr_mask, udata); ->>>>>>> linux-next/akpm-base } EXPORT_SYMBOL(ib_modify_qp_with_udata); _ 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 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 mm-memory_hotplug-just-build-zonelist-for-new-added-node-fix.patch mm-memory_hotplug-just-build-zonelist-for-new-added-node-fix-fix.patch kernel-reboot-add-devm_register_reboot_notifier-fix.patch linux-next-git-rejects.patch kernel-forkc-export-kernel_thread-to-modules.patch slab-leaks3-default-y.patch