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=-7.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=no 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 A01F8C433DF for ; Mon, 24 Aug 2020 17:44:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7F6752067C for ; Mon, 24 Aug 2020 17:44:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598291061; bh=F3wnYZgl4Y6QqS6f6AufTN0fw6ywG644Xk/hVK5BoMU=; h=Date:From:To:Subject:Reply-To:List-ID:From; b=c+3rfifJGUZ0iBlh80vF7wd1qUwxJUEMW+7He+jfNLbpqNShXPEBCAehyW3MaCr3y hpD39vKlRKZwko6OIdji1NNRBp0ykC7sI4ki1vytlSknXz5mXTWENPggcH3h/lkowG YWZhb/VdcLiwh6mS7DQP3cykqYPL6yXgtWYHA5pY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726444AbgHXRoU (ORCPT ); Mon, 24 Aug 2020 13:44:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:37416 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727114AbgHXRoS (ORCPT ); Mon, 24 Aug 2020 13:44:18 -0400 Received: from localhost.localdomain (c-71-198-47-131.hsd1.ca.comcast.net [71.198.47.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0EA0F2067C; Mon, 24 Aug 2020 17:44:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598291058; bh=F3wnYZgl4Y6QqS6f6AufTN0fw6ywG644Xk/hVK5BoMU=; h=Date:From:To:Subject:From; b=yJeL/KGOALETlUVwv/mQgfDtEqFE6/nKpiuZJ7x5/+8vvm4SXXztFV5p8DND1bKI1 6HsYeOmpfNoDt93U8/uS3ukFGqOoXqcWDHScDEOZJ/iAXgWJKuqRS2UmaKopTGngfE aPZn61UmKaZ6RFOPpxuOVwPIRGk5zhQvd7IG3nSM= Date: Mon, 24 Aug 2020 10:44:17 -0700 From: akpm@linux-foundation.org To: akpm@linux-foundation.org, mm-commits@vger.kernel.org Subject: [obsolete] linux-next-git-rejects.patch removed from -mm tree Message-ID: <20200824174417.xUqD1Ixkk%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 Sender: mm-commits-owner@vger.kernel.org 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 removed from the -mm tree. Its filename was linux-next-git-rejects.patch This patch was dropped because it is obsolete ------------------------------------------------------ From: Andrew Morton Subject: linux-next-git-rejects Signed-off-by: Andrew Morton --- drivers/opp/core.c | 41 ----------------------------------------- 1 file changed, 41 deletions(-) --- a/drivers/opp/core.c~linux-next-git-rejects +++ a/drivers/opp/core.c @@ -914,37 +914,7 @@ int dev_pm_opp_set_rate(struct device *d } if (unlikely(!target_freq)) { -<<<<<<< HEAD - /* - * Some drivers need to support cases where some platforms may - * have OPP table for the device, while others don't and - * opp_set_rate() just needs to behave like clk_set_rate(). - */ - if (!_get_opp_count(opp_table)) { - ret = 0; - goto put_opp_table; - } - - if (!opp_table->required_opp_tables && !opp_table->regulators && - !opp_table->paths) { - dev_err(dev, "target frequency can't be 0\n"); - ret = -EINVAL; - goto put_opp_table; - } - - ret = _set_opp_bw(opp_table, NULL, dev, true); - if (ret) - goto put_opp_table; - - if (opp_table->regulator_enabled) { - regulator_disable(opp_table->regulators[0]); - opp_table->regulator_enabled = false; - } - - ret = _set_required_opps(dev, opp_table, NULL); -======= ret = _opp_set_rate_zero(dev, opp_table); ->>>>>>> linux-next/akpm-base goto put_opp_table; } @@ -963,22 +933,11 @@ int dev_pm_opp_set_rate(struct device *d old_freq = clk_get_rate(clk); /* Return early if nothing to do */ -<<<<<<< HEAD - if (old_freq == freq) { - if (!opp_table->required_opp_tables && !opp_table->regulators && - !opp_table->paths) { - dev_dbg(dev, "%s: old/new frequencies (%lu Hz) are same, nothing to do\n", - __func__, freq); - ret = 0; - goto put_opp_table; - } -======= if (opp_table->enabled && old_freq == freq) { dev_dbg(dev, "%s: old/new frequencies (%lu Hz) are same, nothing to do\n", __func__, freq); ret = 0; goto put_opp_table; ->>>>>>> linux-next/akpm-base } /* _ Patches currently in -mm which might be from akpm@linux-foundation.org are mm-slub-re-initialize-randomized-freelist-sequence-in-calculate_sizes-fix.patch mm.patch mm-gup-dont-permit-users-to-call-get_user_pages-with-foll_longterm-fix.patch memblock-make-memblock_debug-and-related-functionality-private-fix.patch mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix-2.patch fs-binfmt_elf-use-pt_load-p_align-values-for-suitable-start-address-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch