From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D83DC4338F for ; Thu, 12 Aug 2021 20:39:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1DCD36103E for ; Thu, 12 Aug 2021 20:39:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231787AbhHLUkW (ORCPT ); Thu, 12 Aug 2021 16:40:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:38320 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229531AbhHLUkV (ORCPT ); Thu, 12 Aug 2021 16:40:21 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 23D8E6109F; Thu, 12 Aug 2021 20:39:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1628800796; bh=+Uet6sviXAwQvfpylKDVE87zfULWOMdLvbiLbhK3Y/U=; h=Date:From:To:Subject:From; b=TN2IG2ZUV0UfSsfUXDtsBPM7fXT5XPngdZ/amzt2fLwv0wEIjIULVyOlf/7V8YAnb 7B5eWOnbD9+8cauoHX/PxGx/S6cGiD0lhaHdFd3yTIuZVczPpMf9FYn+3UBlOd6bnw OyXbF9Q22yYHFD6ehLLfG2jStLvOzWjj9xK4JejU= Date: Thu, 12 Aug 2021 13:39:55 -0700 From: akpm@linux-foundation.org To: akpm@linux-foundation.org, mm-commits@vger.kernel.org Subject: + linux-next-git-rejects.patch added to -mm tree Message-ID: <20210812203955.2TLZ7N6Eg%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: 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 https://ozlabs.org/~akpm/mmots/broken-out/linux-next-git-rejects.patch and later at https://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/process/submit-checklist.rst 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 --- sound/soc/codecs/cs42l42.c | 3 --- 1 file changed, 3 deletions(-) --- a/sound/soc/codecs/cs42l42.c~linux-next-git-rejects +++ a/sound/soc/codecs/cs42l42.c @@ -844,8 +844,6 @@ static int cs42l42_pcm_hw_params(struct if (channels == 1) cs42l42->bclk *= 2; -<<<<<<< HEAD -======= /* * Assume 24-bit samples are in 32-bit slots, to prevent SCLK being * more than assumed (which would result in overclocking). @@ -853,7 +851,6 @@ static int cs42l42_pcm_hw_params(struct if (params_width(params) == 24) cs42l42->bclk = (cs42l42->bclk / 3) * 4; ->>>>>>> linux-next/akpm-base switch(substream->stream) { case SNDRV_PCM_STREAM_CAPTURE: if (channels == 2) { _ Patches currently in -mm which might be from akpm@linux-foundation.org are mm.patch mm-gup-fix-potential-pgmap-refcnt-leak-in-__gup_device_huge-fix.patch mm-gup-fix-potential-pgmap-refcnt-leak-in-__gup_device_huge-fix-fix.patch lazy-tlb-allow-lazy-tlb-mm-refcounting-to-be-configurable-fix.patch mm-compaction-optimize-proactive-compaction-deferrals-fix.patch mm-compaction-support-triggering-of-proactive-compaction-by-user-fix.patch mm-mempolicy-convert-from-atomic_t-to-refcount_t-on-mempolicy-refcnt-fix.patch mm-damon-implement-primitives-for-the-virtual-memory-address-spaces-fix.patch mm-damon-implement-a-debugfs-based-user-space-interface-fix.patch mm-damon-implement-a-debugfs-based-user-space-interface-fix-fix.patch fs-epoll-use-a-per-cpu-counter-for-users-watches-count-fix-fix.patch log-if-a-core-dump-is-aborted-due-to-changed-file-permissions-fix.patch linux-next-rejects.patch linux-next-rejects-fix.patch linux-next-git-rejects.patch kernel-forkc-export-kernel_thread-to-modules.patch