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: Wed, 07 Dec 2016 15:43:21 -0800 Message-ID: <58489e99.K9TZhx0ysmVzLzN0%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]:35518 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932632AbcLGXnL (ORCPT ); Wed, 7 Dec 2016 18:43:11 -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 --- kernel/locking/rtmutex_common.h | 4 ---- 1 file changed, 4 deletions(-) diff -puN kernel/locking/rtmutex_common.h~linux-next-git-rejects kernel/locking/rtmutex_common.h --- a/kernel/locking/rtmutex_common.h~linux-next-git-rejects +++ a/kernel/locking/rtmutex_common.h @@ -76,11 +76,7 @@ static inline struct task_struct *rt_mut { unsigned long owner = (unsigned long) READ_ONCE(lock->owner); -<<<<<<< HEAD - return (struct task_struct *) (owner & ~RT_MUTEX_OWNER_MASKALL); -======= return (struct task_struct *) (owner & ~RT_MUTEX_HAS_WAITERS); ->>>>>>> linux-next/akpm-base } /* _ 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 init-reduce-rootwait-polling-interval-time-to-5ms-fix.patch debug-more-properly-delay-for-secondary-cpus-fix.patch linux-next-rejects.patch linux-next-git-rejects.patch drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch drivers-clk-uniphier-clk-uniphierh-fix-build-with-old-gcc.patch drivers-clk-uniphier-clk-uniphier-mioc-fix-build-for-older-gcc.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