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: Thu, 05 May 2016 12:47:50 -0700 Message-ID: <572ba366.eY9eXOcE5T5VxSHC%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]:59645 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755704AbcEETrv (ORCPT ); Thu, 5 May 2016 15:47:51 -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 --- drivers/input/misc/twl6040-vibra.c | 10 ---------- 1 file changed, 10 deletions(-) diff -puN drivers/input/misc/twl6040-vibra.c~linux-next-git-rejects drivers/input/misc/twl6040-vibra.c --- a/drivers/input/misc/twl6040-vibra.c~linux-next-git-rejects +++ a/drivers/input/misc/twl6040-vibra.c @@ -182,16 +182,6 @@ static void vibra_play_work(struct work_ struct vibra_info *info = container_of(work, struct vibra_info, play_work); int ret; -<<<<<<< HEAD - - /* Do not allow effect, while the routing is set to use audio */ - ret = twl6040_get_vibralr_status(info->twl6040); - if (ret & TWL6040_VIBSEL) { - dev_info(info->dev, "Vibra is configured for audio\n"); - return; - } -======= ->>>>>>> linux-next/akpm-base /* Do not allow effect, while the routing is set to use audio */ ret = twl6040_get_vibralr_status(info->twl6040); _ Patches currently in -mm which might be from akpm@linux-foundation.org are i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch arm-arch-arm-include-asm-pageh-needs-personalityh.patch fsnotify-avoid-spurious-emfile-errors-from-inotify_init-checkpatch-fixes.patch kernel-padata-hide-unused-functions-checkpatch-fixes.patch mm.patch mm-slab-freelist-randomization-v5-fix.patch mm-rename-_count-field-of-the-struct-page-to-_refcount-fix.patch mm-rename-_count-field-of-the-struct-page-to-_refcount-fix-fix.patch include-linux-apply-__malloc-attribute-checkpatch-fixes.patch include-linux-nodemaskh-create-next_node_in-helper.patch include-linux-nodemaskh-create-next_node_in-helper-fix-fix.patch mm-hugetlbc-use-first_memory_node.patch mm-mempolicyc-offset_il_node-document-and-clarify.patch mm-uninline-page_mapped.patch mm-uninline-page_mapped-checkpatch-fixes.patch memory_hotplug-introduce-config_memory_hotplug_default_online-fix.patch oom-oom_reaper-try-to-reap-tasks-which-skip-regular-oom-killer-path-try-to-reap-tasks-which-skip-regular-memcg-oom-killer-path-fix.patch mm-page_alloc-only-check-pagecompound-for-high-order-pages-fix.patch mm-page_alloc-remove-unnecessary-initialisation-from-__alloc_pages_nodemask-fix.patch mm-page_alloc-shorten-the-page-allocator-fast-path-fix.patch mm-page_alloc-avoid-looking-up-the-first-zone-in-a-zonelist-twice-fix.patch mm-page_alloc-un-inline-the-bad-part-of-free_pages_check-fix.patch mm-page_alloc-defer-debugging-checks-of-freed-pages-until-a-pcp-drain-fix.patch mm-page_alloc-dont-duplicate-code-in-free_pcp_prepare-fix.patch mm-page_alloc-dont-duplicate-code-in-free_pcp_prepare-fix-fix.patch mm-compaction-abstract-compaction-feedback-to-helpers-fix.patch mm-oom-compaction-prevent-from-should_compact_retry-looping-for-ever-for-costly-orders-fix.patch mm-thp-avoid-unnecessary-swapin-in-khugepaged-fix.patch procfs-fixes-pthread-cross-thread-naming-if-pr_dumpable-fix.patch exit_thread-remove-empty-bodies-fix.patch exit_thread-accept-a-task-parameter-to-be-exited-checkpatch-fixes.patch fs-execc-fix-minor-memory-leak.patch linux-next-rejects.patch linux-next-git-rejects.patch drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch kernel-forkc-export-kernel_thread-to-modules.patch slab-leaks3-default-y.patch